merging annotations globally and locally

kedacore · May 10, 2023 · 55727c5 · 55727c5
1 parent ccb7243
commit 55727c5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/keda/templates/17-keda-podmonitor.yaml b/keda/templates/17-keda-podmonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Values.operator.name }}
-  {{- with .Values.additionalAnnotations }}
+  {{- with (mergeOverwrite (deepCopy .Values.additionalAnnotations) .Values.prometheus.operator.podMonitor.annotations) }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/keda/templates/17-keda-servicemonitor.yaml b/keda/templates/17-keda-servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.operator.name }}
-  {{- with .Values.additionalAnnotations }}
+  {{- with (mergeOverwrite (deepCopy .Values.additionalAnnotations) .Values.prometheus.operator.serviceMonitor.annotations) }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/keda/templates/26-metrics-podmonitor.yaml b/keda/templates/26-metrics-podmonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
-  {{- with .Values.additionalAnnotations }}
+  {{- with (mergeOverwrite (deepCopy .Values.additionalAnnotations) .Values.prometheus.metricServer.podMonitor.annotations) }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/keda/templates/27-metrics-servicemonitor.yaml b/keda/templates/27-metrics-servicemonitor.yaml
@@ -3,9 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
-  {{- with .Values.additionalAnnotations }}
+  {{- with (mergeOverwrite (deepCopy .Values.additionalAnnotations) .Values.prometheus.metricServer.serviceMonitor.annotations) }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
   {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}

diff --git a/keda/templates/33-webhooks-servicemonitor.yaml b/keda/templates/33-webhooks-servicemonitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.webhooks.name }}
-  {{- with .Values.additionalAnnotations }}
+  {{- with (mergeOverwrite (deepCopy .Values.additionalAnnotations) .Values.prometheus.webhooks.serviceMonitor.annotations) }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/keda/values.yaml b/keda/values.yaml
@@ -369,6 +369,7 @@ prometheus:
     serviceMonitor:
       # Enables ServiceMonitor creation for the Prometheus Operator
       enabled: false
+      annotations: {}
       jobLabel:
       targetLabels: []
       podTargetLabels: []
@@ -381,6 +382,7 @@ prometheus:
     podMonitor:
       # Enables PodMonitor creation for the Prometheus Operator
       enabled: false
+      annotations: {}
       interval:
       scrapeTimeout:
       namespace:
@@ -392,6 +394,7 @@ prometheus:
     serviceMonitor:
       # Enables ServiceMonitor creation for the Prometheus Operator
       enabled: false
+      annotations: {}
       jobLabel:
       targetLabels: []
       podTargetLabels: []
@@ -404,6 +407,7 @@ prometheus:
     podMonitor:
       # Enables PodMonitor creation for the Prometheus Operator
       enabled: false
+      annotations: {}
       interval:
       scrapeTimeout:
       namespace:
@@ -429,6 +433,7 @@ prometheus:
     serviceMonitor:
       # Enables ServiceMonitor creation for the Prometheus webhooks
       enabled: false
+      annotations: {}
       jobLabel:
       targetLabels: []
       podTargetLabels: []
@@ -441,6 +446,7 @@ prometheus:
     prometheusRules:
       # Enables PrometheusRules creation for the Prometheus Operator
       enabled: false
+      annotations: {}
       namespace:
       additionalLabels: {}
       alerts: []