fix: ServiceAccount are correctly annotated

Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>
kedacore · May 1, 2024 · 29aae76 · 29aae76
1 parent 9ab7049
commit 29aae76
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ $ helm repo add kedacore https://kedacore.github.io/charts
 $ helm search repo kedacore
 NAME CHART VERSION APP VERSION DESCRIPTION
 kedacore/external-scaler-azure-cosmos-db 0.1.0 0.1.0 Event-based autoscaler for Azure Cosmos DB chan...
-kedacore/keda 2.14.1 2.14.0 Event-based autoscaler for workloads on Kubernetes
+kedacore/keda 2.14.2 2.14.0 Event-based autoscaler for workloads on Kubernetes
 kedacore/keda-add-ons-http 0.7.0 0.7.0 Event-based autoscaler for HTTP workloads on Ku...
 ```
 

diff --git a/docs/index.yaml b/docs/index.yaml
diff --git a/docs/keda-2.14.2.tgz b/docs/keda-2.14.2.tgz
diff --git a/keda/Chart.yaml b/keda/Chart.yaml
@@ -8,7 +8,7 @@ kubeVersion: ">=v1.23.0-0"
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.14.1
+version: 2.14.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/keda/README.md b/keda/README.md
@@ -36,7 +36,7 @@ To install the chart with the release name `keda`:
 
 ```console
 $ kubectl create namespace keda
-$ helm install keda kedacore/keda --namespace keda --version 2.14.1
+$ helm install keda kedacore/keda --namespace keda --version 2.14.2
 ```
 
 ## Uninstalling the Chart

diff --git a/keda/templates/manager/serviceaccount.yaml b/keda/templates/manager/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.serviceAccount.operator).create | default .Values.serviceAccount.create -}}
+{{- if or (.Values.serviceAccount.operator).create .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -8,7 +8,7 @@ metadata:
  azure.workload.identity/use: "true"
  {{- end }}
  {{- include "keda.labels" . | nindent 4 }}
- {{- if or .Values.podIdentity.azureWorkload.enabled .Values.podIdentity.aws.irsa.enabled ((.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations) .Values.podIdentity.gcp.enabled }}
+ {{- if or .Values.podIdentity.azureWorkload.enabled .Values.podIdentity.aws.irsa.enabled (.Values.serviceAccount.operator).annotations .Values.serviceAccount.annotations .Values.podIdentity.gcp.enabled }}
  annotations:
  {{- if .Values.additionalAnnotations }}
  {{- toYaml .Values.additionalAnnotations | nindent 4 }}
@@ -39,8 +39,11 @@ metadata:
  iam.gke.io/gcp-service-account: {{ .Values.podIdentity.gcp.gcpIAMServiceAccount }}
  {{- end }}
  {{- end }}
- {{- if (.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations }}
- {{- toYaml (.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations | nindent 4}}
+ {{- if (.Values.serviceAccount.operator).annotations }}
+ {{- toYaml (.Values.serviceAccount.operator).annotations | nindent 4}}
+ {{- end }}
+ {{- if .Values.serviceAccount.annotations }}
+ {{- toYaml .Values.serviceAccount.annotations | nindent 4}}
  {{- end }}
  {{- end }}
  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}

diff --git a/keda/templates/metrics-server/serviceaccount.yaml b/keda/templates/metrics-server/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.serviceAccount.metricServer).create | default .Values.serviceAccount.create -}}
+{{- if or (.Values.serviceAccount.metricServer).create .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,8 +9,11 @@ metadata:
  {{- 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}}
+ {{- if (.Values.serviceAccount.metricServer).annotations }}
+ {{- toYaml (.Values.serviceAccount.metricServer).annotations | nindent 4}}
+ {{- end }}
+ {{- if .Values.serviceAccount.annotations }}
+ {{- toYaml .Values.serviceAccount.annotations | nindent 4}}
  {{- end }}
  name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
  namespace: {{ .Release.Namespace }}

diff --git a/keda/templates/webhooks/serviceaccount.yaml b/keda/templates/webhooks/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.serviceAccount.webhooks).create | default .Values.serviceAccount.create -}}
+{{- if or (.Values.serviceAccount.webhooks).create .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,8 +9,11 @@ metadata:
  {{- 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}}
+ {{- if (.Values.serviceAccount.webhooks).annotations }}
+ {{- toYaml (.Values.serviceAccount.webhooks).annotations | nindent 4}}
+ {{- end }}
+ {{- if .Values.serviceAccount.annotations }}
+ {{- toYaml .Values.serviceAccount.annotations | nindent 4}}
  {{- end }}
  name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
  namespace: {{ .Release.Namespace }}