Merge pull request #22 from jianxiaoguo/main

chore(monitor): use common affinity template

Author: duanhongyi

.drone/drone.yml

@@ -142,7 +142,7 @@ steps:
   commands:
   - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/monitor/values.yaml
-  - helm package charts/monitor --version ${DRONE_TAG:-v1.0.0}
+  - helm package -u charts/monitor --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@monitor-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:
     CHARTMUSEUM_USERNAME:

charts/monitor/Chart.yaml

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

charts/monitor/templates/monitor-grafana-deployment.yaml

@@ -22,9 +22,7 @@ spec:
       labels:
         app: drycc-monitor-grafana
     spec:
-      {{- if .Values.global.common }}
-      {{- include "common.affinity" (dict "key" "app" "values" (list "drycc-monitor-grafana")) | indent 6 }}
-      {{- end }}
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-monitor-grafana")) | indent 6 }}
       securityContext:
         fsGroup: 1001
         runAsGroup: 1001

charts/monitor/templates/monitor-telegraf-deployment.yaml

@@ -21,9 +21,7 @@ spec:
       labels:
         app: drycc-monitor-telegraf
     spec:
-      {{- if .Values.global.common }}
-      {{- include "common.affinity" (dict "key" "app" "values" (list "drycc-monitor-telegraf")) | indent 6 }}
-      {{- end }}
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-monitor-telegraf")) | indent 6 }}
       securityContext:
         fsGroup: 1001
         runAsGroup: 1001