fix(core): Annotations are not handled correctly (kedacore#482)

Adarsh-verma-14 · Jun 23, 2023 · ba332ac · ba332ac
1 parent 6e9ca8f
commit ba332ac
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -148,6 +148,11 @@ jobs:
             spec:
               podIdentity:
                 provider: aws-eks
+        additionalAnnotations:
+          sample: "annotation"
+        service:
+          additionalAnnotations:
+            hello: "cloud-native world"
         EOF
 
     - name: Install deps

diff --git a/keda/templates/manager/service.yaml b/keda/templates/manager/service.yaml
@@ -7,9 +7,15 @@ metadata:
     prometheus.io/port: {{ .Values.prometheus.operator.port | quote }}
     prometheus.io/path: "/metrics"
     {{- end }}
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
-    {{- range $key, $value := .Values.service.annotations }}
-      {{ $key }}: {{ $value | quote }}
+    {{- with .Values.additionalAnnotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}

diff --git a/keda/templates/metrics-server/service.yaml b/keda/templates/metrics-server/service.yaml
@@ -13,9 +13,15 @@ metadata:
     prometheus.io/port: {{ .Values.prometheus.metricServer.port | quote }}
     prometheus.io/path: "/metrics"
     {{- end }}
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
-    {{- range $key, $value := .Values.service.annotations }}
-      {{ $key }}: {{ $value | quote }}
+    {{- with .Values.additionalAnnotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
     {{- end }}
 spec:
   ports:

diff --git a/keda/templates/serviceaccount.yaml b/keda/templates/serviceaccount.yaml
@@ -7,11 +7,11 @@ metadata:
     {{- if .Values.podIdentity.azureWorkload.enabled }}
     azure.workload.identity/use: "true"
     {{- end }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   {{- if or .Values.podIdentity.azureWorkload.enabled .Values.podIdentity.aws.irsa.enabled .Values.serviceAccount.annotations .Values.podIdentity.gcp.enabled }}
   annotations:
     {{- if .Values.additionalAnnotations }}
-    {{- toYaml .Values.additionalAnnotations | indent 4 }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
     {{- end }}
     {{- if .Values.podIdentity.azureWorkload.enabled }}
     {{- if .Values.podIdentity.azureWorkload.clientId }}

diff --git a/keda/templates/webhooks/service.yaml b/keda/templates/webhooks/service.yaml
@@ -8,6 +8,16 @@ metadata:
     prometheus.io/port: {{ .Values.prometheus.webhooks.port | quote }}
     prometheus.io/path: "/metrics"
     {{- end }}
+    {{- with .Values.additionalAnnotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
     {{- include "keda.labels" . | indent 4 }}