use templates to merge default and user provided affinity

Signed-off-by: Marius Kimmina <[email protected]>
prometheus-community · Jul 24, 2024 · 3ba3825 · 3ba3825
1 parent 092e199
commit 3ba3825
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/charts/prometheus-node-exporter/templates/_helpers.tpl b/charts/prometheus-node-exporter/templates/_helpers.tpl
@@ -200,3 +200,27 @@ labelValueLengthLimit: {{ . }}
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/*
+The default node affinity to exclude Fargate nodes and merge with user-defined affinity
+*/}}
+{{- define "prometheus-node-exporter.defaultAffinity" -}}
+nodeAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    nodeSelectorTerms:
+    - matchExpressions:
+      - key: eks.amazonaws.com/compute-type
+        operator: NotIn
+        values:
+        - fargate
+{{- end -}}
+
+{{- define "prometheus-node-exporter.mergeAffinities" -}}
+{{- $defaultAffinity := include "prometheus-node-exporter.defaultAffinity" . | fromYaml -}}
+{{- $userAffinity := .Values.affinity -}}
+{{- if and $userAffinity $userAffinity.nodeAffinity -}}
+  {{- $mergedNodeAffinity := merge $defaultAffinity.nodeAffinity $userAffinity.nodeAffinity -}}
+  {{- $_ := set $defaultAffinity "nodeAffinity" $mergedNodeAffinity -}}
+{{- end -}}
+{{- toYaml $defaultAffinity -}}
+{{- end -}}
diff --git a/charts/prometheus-node-exporter/templates/daemonset.yaml b/charts/prometheus-node-exporter/templates/daemonset.yaml
@@ -246,17 +246,7 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       hostPID: {{ .Values.hostPID }}
       affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: eks.amazonaws.com/compute-type
-                    operator: NotIn
-                    values: 
-                      - fargate
-      {{- with .Values.affinity }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- include "prometheus-node-exporter.mergeAffinities" . | nindent 8 }}
       {{- with .Values.dnsConfig }}
       dnsConfig:
         {{- toYaml . | nindent 8 }}