Prepare release v2.14.3 (#669)

* fix: labels on cloudeventsources CRD should be the same as other CRDs (#656) Signed-off-by: Joel Dimbernat <joel.dimbernat@shipfix.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * chore: Update comments and suggested defaults (#651) Signed-off-by: Kamil Aliev <kamilaliev@hotmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix: broken "| default" logic for automountServiceAccountToken (#665) When setting (.Values.serviceAccount.operator).automountServiceAccountToken to boolean false, the "| default" part kicks in. Fix is strongly inspired from helm/helm#12080 (comment) Signed-off-by: François Blondel <francois.blondel@diva-e.com> Co-authored-by: François Blondel <francois.blondel@diva-e.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix: add forgotten crds.additionalAnnotations to crd-cloudeventsources.yaml (#668) Signed-off-by: François Blondel <francois.blondel@diva-e.com> Co-authored-by: François Blondel <francois.blondel@diva-e.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * Prepare release v2.14.3 Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> --------- Signed-off-by: Joel Dimbernat <joel.dimbernat@shipfix.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Signed-off-by: Kamil Aliev <kamilaliev@hotmail.com> Signed-off-by: François Blondel <francois.blondel@diva-e.com> Co-authored-by: JoelDimbernat <134919209+JoelDimbernat@users.noreply.github.com> Co-authored-by: Kamil Aliev <kamilaliev@yahoo.com> Co-authored-by: François Blondel <frablondel@free.fr> Co-authored-by: François Blondel <francois.blondel@diva-e.com>
kedacore · Jul 31, 2024 · beac651 · beac651
1 parent 407afac
commit beac651
Show file tree

Hide file tree

Showing 13 changed files with 118 additions and 92 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.2          2.14.0          Event-based autoscaler for workloads on Kubernetes
+kedacore/keda                                   2.14.3          2.14.1          Event-based autoscaler for workloads on Kubernetes
 kedacore/keda-add-ons-http                      0.8.0           0.8.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.3.tgz b/docs/keda-2.14.3.tgz
diff --git a/keda/Chart.yaml b/keda/Chart.yaml
@@ -8,11 +8,11 @@ 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.2
+version: 2.14.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.14.0
+appVersion: 2.14.1
 
 home: https://github.com/kedacore/keda
 icon: https://raw.githubusercontent.com/kedacore/keda/main/images/keda-logo-500x500-white.png

diff --git a/keda/README.md b/keda/README.md
@@ -60,7 +60,7 @@ their default values.
 |-----------|------|---------|-------------|
 | `additionalAnnotations` | object | `{}` | Custom annotations to add into metadata |
 | `additionalLabels` | object | `{}` | Custom labels to add into metadata |
-| `affinity` | object | `{}` | [Affinity] for pod scheduling for both KEDA operator and Metrics API Server |
+| `affinity` | object | `{}` | [Affinity] for pod scheduling for KEDA operator, Metrics API Server and KEDA admission webhooks. |
 | `asciiArt` | bool | `true` | Capability to turn on/off ASCII art in Helm installation notes |
 | `certificates.autoGenerated` | bool | `true` | Enables the self generation for KEDA TLS certificates inside KEDA operator |
 | `certificates.certManager.caSecretName` | string | `"kedaorg-ca"` | Secret name where the CA is stored (generatedby cert-manager or user given) |
@@ -95,7 +95,6 @@ their default values.
 | `networkPolicy.enabled` | bool | `false` | Enable network policies |
 | `networkPolicy.flavor` | string | `"cilium"` | Flavor of the network policies (cilium) |
 | `nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) |
-| `podIdentity.activeDirectory.identity` | string | `""` | Identity in Azure Active Directory to use for Azure pod identity |
 | `podIdentity.aws.irsa.audience` | string | `"sts.amazonaws.com"` | Sets the token audience for IRSA. This will be set as an annotation on the KEDA service account. |
 | `podIdentity.aws.irsa.enabled` | bool | `false` | Specifies whether [AWS IAM Roles for Service Accounts (IRSA)](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html) is to be enabled or not. |
 | `podIdentity.aws.irsa.roleArn` | string | `""` | Set to the value of the ARN of an IAM role with a web identity provider. This will be set as an annotation on the KEDA service account. |

diff --git a/keda/templates/crds/crd-cloudeventsources.yaml b/keda/templates/crds/crd-cloudeventsources.yaml
@@ -4,9 +4,12 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.crd-labels" . | indent 4 }}
   name: cloudeventsources.eventing.keda.sh
 spec:
   group: eventing.keda.sh

diff --git a/keda/templates/manager/deployment.yaml b/keda/templates/manager/deployment.yaml
@@ -56,7 +56,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
-      automountServiceAccountToken: {{ (.Values.serviceAccount.operator).automountServiceAccountToken | default .Values.serviceAccount.automountServiceAccountToken }}
+      automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.operator).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.operator).automountServiceAccountToken }}
       securityContext:
         {{- if .Values.podSecurityContext.operator }}
         {{- toYaml .Values.podSecurityContext.operator | nindent 8 }}

diff --git a/keda/templates/manager/serviceaccount.yaml b/keda/templates/manager/serviceaccount.yaml
@@ -45,5 +45,5 @@ metadata:
   {{- end }}
   name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
-automountServiceAccountToken: {{ (.Values.serviceAccount.operator).automountServiceAccountToken | default .Values.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.operator).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.operator).automountServiceAccountToken }}
 {{- end -}}
diff --git a/keda/templates/metrics-server/deployment.yaml b/keda/templates/metrics-server/deployment.yaml
@@ -58,7 +58,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
-      automountServiceAccountToken: {{ (.Values.serviceAccount.metricServer).automountServiceAccountToken | default .Values.serviceAccount.automountServiceAccountToken }}
+      automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.metricServer).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.metricServer).automountServiceAccountToken }}
       securityContext:
         {{- if .Values.podSecurityContext.metricServer }}
         {{- toYaml .Values.podSecurityContext.metricServer | nindent 8 }}

diff --git a/keda/templates/metrics-server/serviceaccount.yaml b/keda/templates/metrics-server/serviceaccount.yaml
@@ -14,5 +14,5 @@ metadata:
     {{- end }}
   name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
-automountServiceAccountToken: {{ (.Values.serviceAccount.metricServer).automountServiceAccountToken | default .Values.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.metricServer).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.metricServer).automountServiceAccountToken }}
 {{- end -}}
diff --git a/keda/templates/webhooks/deployment.yaml b/keda/templates/webhooks/deployment.yaml
@@ -51,7 +51,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
-      automountServiceAccountToken: {{ (.Values.serviceAccount.webhooks).automountServiceAccountToken | default .Values.serviceAccount.automountServiceAccountToken }}
+      automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.webhooks).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.webhooks).automountServiceAccountToken }}
       securityContext:
         {{- if .Values.podSecurityContext.webhooks }}
         {{- toYaml .Values.podSecurityContext.webhooks | nindent 8 }}

diff --git a/keda/templates/webhooks/serviceaccount.yaml b/keda/templates/webhooks/serviceaccount.yaml
@@ -14,5 +14,5 @@ metadata:
     {{- end }}
   name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
-automountServiceAccountToken: {{ (.Values.serviceAccount.webhooks).automountServiceAccountToken | default .Values.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.webhooks).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.webhooks).automountServiceAccountToken }}
 {{- end -}}
diff --git a/keda/values.yaml b/keda/values.yaml
@@ -200,7 +200,7 @@ webhooks:
     #       - key: app
     #         operator: In
     #         values:
-    #         - keda-operator
+    #         - keda-admission-webhooks
     #     topologyKey: "kubernetes.io/hostname"
 
   # -- [Failure policy](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#failure-policy) to use with KEDA admission webhooks
@@ -518,7 +518,7 @@ topologySpreadConstraints:
   # -- [Pod Topology Constraints] of KEDA admission webhooks pod
   webhooks: []
 
-# -- [Affinity] for pod scheduling for both KEDA operator and Metrics API Server
+# -- [Affinity] for pod scheduling for KEDA operator, Metrics API Server and KEDA admission webhooks.
 affinity: {}
   # podAntiAffinity:
   #   requiredDuringSchedulingIgnoredDuringExecution:
@@ -529,6 +529,7 @@ affinity: {}
   #         values:
   #         - keda-operator
   #         - keda-operator-metrics-apiserver
+  #         - keda-admission-webhooks
   #     topologyKey: "kubernetes.io/hostname"
 
 # -- priorityClassName for all KEDA components