Skip to content

Commit bb2e052

Browse files
committed
chore(helmbroker): switch charts to oci
1 parent d8619e6 commit bb2e052

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

.drone/drone.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,16 @@ steps:
128128
commands:
129129
- IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
130130
- sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/helmbroker/values.yaml
131-
- helm package -u charts/helmbroker --version ${DRONE_TAG:-v1.0.0}
132-
- curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@helmbroker-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
131+
- helm package -u charts/helmbroker --version $([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v})
132+
- echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin
133+
- helm push helmbroker-$([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v}).tgz oci://$DRYCC_REGISTRY/$([ -z $DRONE_TAG ] && echo charts-testing || echo charts)
133134
environment:
134-
CHARTMUSEUM_USERNAME:
135-
from_secret: chartmuseum_username
136-
CHARTMUSEUM_PASSWORD:
137-
from_secret: chartmuseum_password
138-
CHARTMUSEUM_API:
139-
from_secret: chartmuseum_api
135+
DRYCC_REGISTRY:
136+
from_secret: drycc_registry
137+
CONTAINER_USERNAME:
138+
from_secret: container_username
139+
CONTAINER_PASSWORD:
140+
from_secret: container_password
140141
when:
141142
event:
142143
- push

charts/helmbroker/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ home: https://github.com/drycc/helmbroker
33
apiVersion: v2
44
dependencies:
55
- name: common
6-
repository: https://charts.drycc.cc/stable
7-
version: 1.x.x
6+
repository: oci://registry.drycc.cc/charts
7+
version: ~1.1.1
88
description: Drycc Workflow helmbroker.
99
maintainers:
1010
- name: Drycc Team

rootfs/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ FROM registry.drycc.cc/drycc/base:bullseye
33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/workspace \
6-
PYTHON_VERSION="3.10.4" \
7-
HELM_VERSION="3.8.0" \
8-
KUBECTL_VERSION="1.23.4"
6+
PYTHON_VERSION="3.10.6" \
7+
HELM_VERSION="3.9.4" \
8+
KUBECTL_VERSION="1.25.0"
99

1010
RUN groupadd drycc --gid ${DRYCC_GID} \
1111
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

rootfs/Dockerfile.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ FROM registry.drycc.cc/drycc/base:bullseye
33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/workspace \
6-
PYTHON_VERSION="3.10.4" \
7-
HELM_VERSION="3.8.0" \
8-
KUBECTL_VERSION="1.23.4"
6+
PYTHON_VERSION="3.10.6" \
7+
HELM_VERSION="3.9.4" \
8+
KUBECTL_VERSION="1.25.0"
99

1010
RUN groupadd drycc --gid ${DRYCC_GID} \
1111
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

0 commit comments

Comments
 (0)