Merge branch 'main' of github.com:drycc/helmbroker into main

Author: duanhongyi

.drone/drone.yml

@@ -118,7 +118,7 @@ steps:
   commands:
   - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/helmbroker/values.yaml
-  - helm package charts/helmbroker --version ${DRONE_TAG:-v1.0.0}
+  - helm package -u charts/helmbroker --version ${DRONE_TAG:-v1.0.0}
   - 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"
   environment:
     CHARTMUSEUM_USERNAME:

charts/helmbroker/Chart.yaml

@@ -1,7 +1,12 @@
 name: helmbroker
 home: https://github.com/drycc/helmbroker
-version: v1.0.0
+apiVersion: v2
+dependencies:
+  - name: common
+    repository: https://charts.drycc.cc/stable
+    version: 1.x.x
 description: Drycc Workflow helmbroker.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com
+version: v1.0.0

charts/helmbroker/templates/helmbroker-celery.yaml

@@ -21,6 +21,7 @@ spec:
       labels:
         app: drycc-helmbroker-celery
     spec:
+      {{- include "common.affinities.pods.soft" (dict "key" "app" "values" (list "drycc-helmbroker-celery")) | indent 6 }}
       serviceAccount: drycc-helmbroker
       containers:
         - name: drycc-helmbroker-celery
@@ -33,4 +34,4 @@ spec:
           {{- include "helmbroker.limits" . | indent 10 }}
           {{- include "helmbroker.envs" . | indent 10 }}
           {{- include "helmbroker.volumeMounts" . | indent 10 }}
-      {{- include "helmbroker.volumes" . | indent 6 }}
+      {{- include "helmbroker.volumes" . | indent 6 }}

charts/helmbroker/templates/helmbroker-deployment.yaml

@@ -21,6 +21,7 @@ spec:
       labels:
         app: drycc-helmbroker
     spec:
+      {{- include "common.affinities.pods.soft" (dict "key" "app" "values" (list "drycc-helmbroker")) | indent 6 }}
       serviceAccount: drycc-helmbroker
       initContainers:
         - name: loader
@@ -55,4 +56,4 @@ spec:
           {{- include "helmbroker.limits" . | indent 10 }}
           {{- include "helmbroker.envs" . | indent 10 }}
           {{- include "helmbroker.volumeMounts" . | indent 10 }}
-      {{- include "helmbroker.volumes" . | indent 6 }}
+      {{- include "helmbroker.volumes" . | indent 6 }}

rootfs/Dockerfile

@@ -4,18 +4,20 @@ ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
   PYTHON_VERSION="3.10.4" \
-  HELM_VERSION="3.8.0"
+  HELM_VERSION="3.8.0" \
+  KUBECTL_VERSION="1.23.4"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
 
 COPY . ${DRYCC_HOME_DIR}
 WORKDIR ${DRYCC_HOME_DIR}
 
-RUN buildDeps='musl-dev openssl' \
-  && install-packages ${buildDeps} \
+RUN buildDeps='musl-dev' \
+  && install-packages ${buildDeps} openssl ca-certificates \
   && install-stack python ${PYTHON_VERSION} \
-  && install-stack helm ${HELM_VERSION} && . init-stack \
+  && install-stack helm ${HELM_VERSION} \
+  && install-stack kubectl ${KUBECTL_VERSION} && . init-stack \
   && python3 -m venv ${DRYCC_HOME_DIR}/.venv \
   && source ${DRYCC_HOME_DIR}/.venv/bin/activate \
   && pip3 install --disable-pip-version-check --no-cache-dir -r ${DRYCC_HOME_DIR}/requirements.txt \

rootfs/Dockerfile.test

@@ -13,8 +13,8 @@ RUN groupadd drycc --gid ${DRYCC_GID} \
 COPY . ${DRYCC_HOME_DIR}
 WORKDIR ${DRYCC_HOME_DIR}
 
-RUN buildDeps='musl-dev openssl'; \
-  install-packages ${buildDeps} \
+RUN buildDeps='musl-dev'; \
+  install-packages ${buildDeps} openssl ca-certificates \
   && install-stack python ${PYTHON_VERSION} \
   && install-stack helm ${HELM_VERSION} \
   && install-stack kubectl ${KUBECTL_VERSION} && . init-stack \