[kube-state-metrics] tpl for affinity (#5231)

* [kube-state-metrics] tpl affinity Signed-off-by: TheRealNoob <[email protected]> * update values.yaml Signed-off-by: TheRealNoob <[email protected]> * Update charts/kube-state-metrics/values.yaml Signed-off-by: David Calvert <[email protected]> * Update charts/kube-state-metrics/values.yaml Signed-off-by: David Calvert <[email protected]> --------- Signed-off-by: TheRealNoob <[email protected]> Signed-off-by: David Calvert <[email protected]> Co-authored-by: David Calvert <[email protected]>
prometheus-community · Jan 29, 2025 · 19b7e97 · 19b7e97
1 parent dc431ff
commit 19b7e97
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
   - prometheus
   - kubernetes
 type: application
-version: 5.28.0
+version: 5.28.1
 appVersion: 2.14.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml
@@ -307,7 +307,11 @@ spec:
       {{- end }}
       {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+        {{- if kindIs "map" .Values.affinity }}
+        {{- toYaml .Values.affinity | nindent 8 }}
+        {{- else }}
+        {{- tpl .Values.affinity $ | nindent 8 }}
+        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml
@@ -304,8 +304,16 @@ containerSecurityContext:
 nodeSelector: {}
 
 ## Affinity settings for pod assignment
+## Can be defined as either a dict or string. String is useful for `tpl` templating.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
 affinity: {}
+# affinity: |
+#   podAntiAffinity:
+#     requiredDuringSchedulingIgnoredDuringExecution:
+#       - labelSelector:
+#           matchLabels:
+#             {{- include "kube-state-metrics.selectorLabels" . | indent 10 }}
+#         topologyKey: kubernetes.io/hostname
 
 ## Tolerations for pod assignment
 ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/