Merge pull request #7 from jianxiaoguo/main

chore(helmbroker): use common affinity template

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,10 +21,8 @@ spec:
       labels:
         app: drycc-helmbroker-celery
     spec:
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-helmbroker-celery")) | indent 6 }}
       serviceAccount: drycc-helmbroker
-      {{- if .Values.global.common }}
-      {{- include "common.affinity" (dict "key" "app" "values" (list "drycc-helmbroker-celery")) | indent 6 }}
-      {{- end }}
       containers:
         - name: drycc-helmbroker-celery
           image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/helmbroker:{{.Values.imageTag}}

charts/helmbroker/templates/helmbroker-deployment.yaml

@@ -21,9 +21,7 @@ spec:
       labels:
         app: drycc-helmbroker
     spec:
-      {{- if .Values.global.common }}
-      {{- include "common.affinity" (dict "key" "app" "values" (list "drycc-helmbroker")) | indent 6 }}
-      {{- end }}
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-helmbroker")) | indent 6 }}
       serviceAccount: drycc-helmbroker
       initContainers:
         - name: loader