Merge pull request #7072 from Kellen275/kgsappington/servicemonitor-a…

…nnotations Only render ServiceMonitor annotations if not empty
kubernetes · Sep 30, 2024 · f79e8d4 · f79e8d4
2 parents 8fc7566 + dfb30e6
commit f79e8d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml
@@ -11,4 +11,4 @@ name: cluster-autoscaler
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
-version: 9.42.0
+version: 9.43.0
diff --git a/charts/cluster-autoscaler/templates/servicemonitor.yaml b/charts/cluster-autoscaler/templates/servicemonitor.yaml
@@ -6,8 +6,10 @@ metadata:
   {{- if .Values.serviceMonitor.namespace }}
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
+  {{- if .Values.serviceMonitor.annotations }}
   annotations:
 {{ toYaml .Values.serviceMonitor.annotations | indent 4 }}
+  {{- end }}
   labels:
   {{- range $key, $value := .Values.serviceMonitor.selector }}
     {{ $key }}: {{ $value | quote }}