fixing annotations style for svcms

kedacore · May 9, 2023 · e6aa99c · e6aa99c
1 parent db363c4
commit e6aa99c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/keda/templates/17-keda-podmonitor.yaml b/keda/templates/17-keda-podmonitor.yaml
@@ -3,8 +3,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Values.operator.name }}
+  {{- with .Values.prometheus.operator.podMonitor.annotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
     {{- include "keda.labels" . | indent 4 }}

diff --git a/keda/templates/17-keda-servicemonitor.yaml b/keda/templates/17-keda-servicemonitor.yaml
@@ -3,8 +3,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.operator.name }}
+  {{- with .Values.prometheus.operator.serviceMonitor.annotations }}
   annotations:
-    {{- toYaml .Values.prometheus.operator.serviceMonitor.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
     {{- include "keda.labels" . | indent 4 }}

diff --git a/keda/templates/26-metrics-podmonitor.yaml b/keda/templates/26-metrics-podmonitor.yaml
@@ -3,8 +3,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with .Values.prometheus.metricServer.podMonitor.annotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
     {{- include "keda.labels" . | indent 4 }}

diff --git a/keda/templates/27-metrics-servicemonitor.yaml b/keda/templates/27-metrics-servicemonitor.yaml
@@ -3,8 +3,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with .Values.prometheus.metricServer.serviceMonitor.annotations }}
   annotations:
-    {{- toYaml .Values.prometheus.metricServer.serviceMonitor.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
     {{- include "keda.labels" . | indent 4 }}

diff --git a/keda/templates/33-webhooks-servicemonitor.yaml b/keda/templates/33-webhooks-servicemonitor.yaml
@@ -4,8 +4,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.webhooks.name }}
+  {{- with .Values.prometheus.webhooks.serviceMonitor.annotations }}
   annotations:
-    {{- toYaml .Values.prometheus.webhooks.serviceMonitor.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
     {{- include "keda.labels" . | indent 4 }}

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: []