remove unused variables (#814)

Signed-off-by: Eugene Babichev <eugene.babichev@clickhouse.com>

Author: BEvgeniyS

keda/templates/metrics-server/serviceaccount.yaml

@@ -5,13 +5,15 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
     {{- include "keda.labels" . | nindent 4 }}
+  {{- if or .Values.additionalAnnotations ((.Values.serviceAccount.metricServer).annotations | default .Values.serviceAccount.annotations) }}
   annotations:
     {{- if .Values.additionalAnnotations }}
     {{- toYaml .Values.additionalAnnotations | nindent 4 }}
     {{- end }}
     {{- if (.Values.serviceAccount.metricServer).annotations | default .Values.serviceAccount.annotations }}
     {{- toYaml ((.Values.serviceAccount.metricServer).annotations | default .Values.serviceAccount.annotations) | nindent 4}}
     {{- end }}
+  {{- end }}
   name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
 automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.metricServer).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.metricServer).automountServiceAccountToken }}

keda/templates/webhooks/service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  {{- if or .Values.prometheus.webhooks.enabled .Values.additionalAnnotations .Values.service.annotations }}
+  {{- if or (and .Values.prometheus.webhooks.enabled (not .Values.prometheus.webhooks.serviceMonitor.enabled)) .Values.additionalAnnotations .Values.service.annotations }}
   annotations:
     {{- if and .Values.prometheus.webhooks.enabled ( not .Values.prometheus.webhooks.serviceMonitor.enabled ) }}
     prometheus.io/scrape: "true"

keda/templates/webhooks/serviceaccount.yaml

@@ -5,13 +5,15 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
     {{- include "keda.labels" . | nindent 4 }}
+  {{- if or .Values.additionalAnnotations ((.Values.serviceAccount.webhooks).annotations | default .Values.serviceAccount.annotations) }}
   annotations:
     {{- if .Values.additionalAnnotations }}
     {{- toYaml .Values.additionalAnnotations | nindent 4 }}
     {{- end }}
     {{- if (.Values.serviceAccount.webhooks).annotations | default .Values.serviceAccount.annotations }}
     {{- toYaml ((.Values.serviceAccount.webhooks).annotations | default .Values.serviceAccount.annotations) | nindent 4}}
     {{- end }}
+  {{- end }}
   name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
 automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.webhooks).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.webhooks).automountServiceAccountToken }}