diff --git a/keda/Chart.yaml b/keda/Chart.yaml index 00c4e2ed..04a08f97 100644 --- 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.12.1 +version: 2.12.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/templates/crds/crd-clustertriggerauthentications.yaml b/keda/templates/crds/crd-clustertriggerauthentications.yaml index 792a7d18..b60728d1 100644 --- a/keda/templates/crds/crd-clustertriggerauthentications.yaml +++ b/keda/templates/crds/crd-clustertriggerauthentications.yaml @@ -4,8 +4,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - {{- if .Values.additionalAnnotations }} - {{- toYaml .Values.additionalAnnotations | nindent 4 }} + {{- 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 }} diff --git a/keda/templates/crds/crd-scaledjobs.yaml b/keda/templates/crds/crd-scaledjobs.yaml index 8473b6f8..886efbb4 100644 --- a/keda/templates/crds/crd-scaledjobs.yaml +++ b/keda/templates/crds/crd-scaledjobs.yaml @@ -4,8 +4,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - {{- if .Values.additionalAnnotations }} - {{- toYaml .Values.additionalAnnotations | nindent 4 }} + {{- 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 }} diff --git a/keda/templates/crds/crd-scaledobjects.yaml b/keda/templates/crds/crd-scaledobjects.yaml index 05f98ce1..f473db61 100644 --- a/keda/templates/crds/crd-scaledobjects.yaml +++ b/keda/templates/crds/crd-scaledobjects.yaml @@ -4,8 +4,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - {{- if .Values.additionalAnnotations }} - {{- toYaml .Values.additionalAnnotations | nindent 4 }} + {{- 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 }} diff --git a/keda/templates/crds/crd-triggerauthentications.yaml b/keda/templates/crds/crd-triggerauthentications.yaml index 4facbdba..5d787c3c 100644 --- a/keda/templates/crds/crd-triggerauthentications.yaml +++ b/keda/templates/crds/crd-triggerauthentications.yaml @@ -4,8 +4,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - {{- if .Values.additionalAnnotations }} - {{- toYaml .Values.additionalAnnotations | nindent 4 }} + {{- 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 }} diff --git a/keda/values.yaml b/keda/values.yaml index cbe2f70c..a8ba6199 100644 --- a/keda/values.yaml +++ b/keda/values.yaml @@ -42,6 +42,10 @@ crds: # -- Defines whether the KEDA CRDs have to be installed or not. install: true + additionalAnnotations: + {} + # foo: bar + # -- Defines Kubernetes namespaces to watch to scale their workloads. Default watches all namespaces watchNamespace: ""