chore(monitor): fine management affinity

Author: duanhongyi

charts/monitor/Chart.yaml

@@ -9,4 +9,4 @@ description: Monitoring for Drycc Workflow.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com
-version: v1.0.0
+version: v1.1.0

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

@@ -22,7 +22,10 @@ spec:
       labels:
         app: drycc-monitor-grafana
     spec:
-      {{- include "common.affinities.pods.soft" (dict "key" "app" "values" (list "drycc-monitor-grafana")) | indent 6 }}
+      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 }}
+        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
         runAsGroup: 1001

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

@@ -20,7 +20,10 @@ spec:
       labels:
         app: drycc-monitor-telegraf
     spec:
-      {{- include "common.affinities.pods.soft" (dict "key" "app" "values" (list "drycc-monitor-telegraf")) | indent 6 }}
+      affinity:
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.telegraf.podAffinityPreset.type "key" .Values.telegraf.podAffinityPreset.key "values" .Values.telegraf.podAffinityPreset.values ) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.telegraf.podAntiAffinityPreset.type "key" .Values.telegraf.podAntiAffinityPreset.key "values" .Values.telegraf.podAntiAffinityPreset.values ) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.telegraf.nodeAffinityPreset.type "key" .Values.telegraf.nodeAffinityPreset.key "values" .Values.telegraf.nodeAffinityPreset.values ) | nindent 10 }}
       securityContext:
         fsGroup: 1001
         runAsGroup: 1001

charts/monitor/values.yaml

@@ -5,6 +5,23 @@ grafana:
   imageRegistry: "registry.drycc.cc"
   # limitsCpu: "100m"
   # limitsMemory: "50Mi"
+  nodeAffinityPreset:
+    key: "drycc.cc/node"
+    type: "soft"
+    values:
+    - "true"
+
+  podAffinityPreset:
+    key: "security"
+    type: ""
+    values:
+    - "drycc-security"
+
+  podAntiAffinityPreset:
+    key: "app"
+    type: "soft"
+    values:
+    - " drycc-monitor-grafana"
 
   # Service
   service:
@@ -28,6 +45,23 @@ telegraf:
   imageRegistry: "registry.drycc.cc"
   # limitsCpu: "100m"
   # limitsMemory: "50Mi"
+  nodeAffinityPreset:
+    key: "drycc.cc/node"
+    type: "soft"
+    values:
+    - "true"
+
+  podAffinityPreset:
+    key: "security"
+    type: ""
+    values:
+    - "drycc-security"
+
+  podAntiAffinityPreset:
+    key: "app"
+    type: "soft"
+    values:
+    - " drycc-monitor-telegraf"
 
 redis:
   replicas: 1