chore(monitor): bump common 1.1.2

Author: duanhongyi

charts/monitor/Chart.yaml

@@ -5,7 +5,7 @@ appVersion: 1.0.0
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
-    version: ~1.1.1
+    version: ~1.1.2
 description: Monitoring for Drycc Workflow.
 maintainers:
   - name: Drycc Team

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

@@ -19,12 +19,12 @@ spec:
       app: drycc-monitor-grafana
   template:
     metadata:
-      labels:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
         app: drycc-monitor-grafana
     spec:
       affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.grafana.podAffinityPreset.type "key" .Values.grafana.podAffinityPreset.key "values" .Values.grafana.podAffinityPreset.values ) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.grafana.podAntiAffinityPreset.type "key" .Values.grafana.podAntiAffinityPreset.key "values" .Values.grafana.podAntiAffinityPreset.values ) | nindent 10 }}
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.grafana.podAffinityPreset.type "component" "" "extraMatchLabels" .Values.grafana.podAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.grafana.podAntiAffinityPreset.type "component" "" "extraMatchLabels" .Values.grafana.podAntiAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
         nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.grafana.nodeAffinityPreset.type "key" .Values.grafana.nodeAffinityPreset.key "values" .Values.grafana.nodeAffinityPreset.values ) | nindent 10 }}
       securityContext:
         fsGroup: 1001

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

@@ -16,7 +16,7 @@ spec:
   {{- end }}
   template:
     metadata:
-      labels:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
         app: drycc-monitor-telegraf
     spec:
       securityContext:

charts/monitor/values.yaml

@@ -12,16 +12,14 @@ grafana:
     - "true"
 
   podAffinityPreset:
-    key: "security"
     type: ""
-    values:
-    - "drycc-security"
+    extraMatchLabels:
+      security: "drycc-security"
 
   podAntiAffinityPreset:
-    key: "app"
     type: "soft"
-    values:
-    - "drycc-monitor-grafana"
+    extraMatchLabels:
+      app: "drycc-monitor-grafana"
 
   # Service
   service:
@@ -57,16 +55,14 @@ telegraf:
     - "true"
 
   podAffinityPreset:
-    key: "security"
     type: ""
-    values:
-    - "drycc-security"
+    extraMatchLabels:
+      security: "drycc-security"
 
   podAntiAffinityPreset:
-    key: "app"
     type: "soft"
-    values:
-    - "drycc-monitor-telegraf"
+    extraMatchLabels:
+      app: "drycc-monitor-telegraf"
 
 redis:
   replicas: 1