diff --git a/keda/README.md b/keda/README.md index f33d9c202..77f2df480 100644 --- a/keda/README.md +++ b/keda/README.md @@ -130,6 +130,8 @@ their default values. | Parameter | Type | Default | Description | |-----------|------|---------|-------------| | `certificates.operator` | string | `nil` | | +| `deploymentAnnotations.keda` | object | `{}` | Deployment annotations for KEDA operator | +| `deploymentLabels.keda` | object | `{}` | Deployment labels for KEDA operator | | `extraArgs.keda` | object | `{}` | Additional KEDA Operator container arguments | | `image.keda.registry` | string | `"ghcr.io"` | Image registry of KEDA operator | | `image.keda.repository` | string | `"kedacore/keda"` | Image name of KEDA operator | @@ -176,6 +178,8 @@ their default values. | Parameter | Type | Default | Description | |-----------|------|---------|-------------| +| `deploymentAnnotations.metricsAdapter` | object | `{}` | Deployment annotations for KEDA Metrics Adapter | +| `deploymentLabels.metricsAdapter` | object | `{}` | Deployment labels for KEDA Metrics Adapter | | `extraArgs.metricsAdapter` | object | `{}` | Additional Metrics Adapter container arguments | | `image.metricsApiServer.registry` | string | `"ghcr.io"` | Image registry of KEDA Metrics API Server | | `image.metricsApiServer.repository` | string | `"kedacore/keda-metrics-apiserver"` | Image name of KEDA Metrics API Server | @@ -313,6 +317,8 @@ their default values. | Parameter | Type | Default | Description | |-----------|------|---------|-------------| +| `deploymentAnnotations.webhooks` | object | `{}` | Deployment annotations for KEDA Admission webhooks | +| `deploymentLabels.webhooks` | object | `{}` | Deployment labels for KEDA Admission webhooks | | `image.webhooks.registry` | string | `"ghcr.io"` | Image registry of KEDA admission-webhooks | | `image.webhooks.repository` | string | `"kedacore/keda-admission-webhooks"` | Image name of KEDA admission-webhooks | | `image.webhooks.tag` | string | `""` | Image tag of KEDA admission-webhooks . Optional, given app version of Helm chart is used by default | diff --git a/keda/templates/manager/deployment.yaml b/keda/templates/manager/deployment.yaml index 1db0f14c4..c32a8beef 100644 --- a/keda/templates/manager/deployment.yaml +++ b/keda/templates/manager/deployment.yaml @@ -3,15 +3,23 @@ kind: Deployment metadata: name: {{ .Values.operator.name }} namespace: {{ .Release.Namespace }} - {{- with .Values.additionalAnnotations }} + {{- if or .Values.additionalAnnotations .Values.deploymentAnnotations.keda }} annotations: + {{- with .Values.additionalAnnotations }} {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.deploymentAnnotations.keda }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} labels: app: {{ .Values.operator.name }} name: {{ .Values.operator.name }} app.kubernetes.io/name: {{ .Values.operator.name }} {{- include "keda.labels" . | indent 4 }} + {{- with .Values.deploymentLabels.keda }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: revisionHistoryLimit: {{ .Values.operator.revisionHistoryLimit}} replicas: {{ .Values.operator.replicaCount}} diff --git a/keda/templates/metrics-server/deployment.yaml b/keda/templates/metrics-server/deployment.yaml index 3d19aa2e9..5bb8d46dd 100644 --- a/keda/templates/metrics-server/deployment.yaml +++ b/keda/templates/metrics-server/deployment.yaml @@ -4,14 +4,22 @@ kind: Deployment metadata: name: {{ .Values.operator.name }}-metrics-apiserver namespace: {{ .Release.Namespace }} - {{- with .Values.additionalAnnotations }} + {{- if or .Values.additionalAnnotations .Values.deploymentAnnotations.metricsAdapter }} annotations: + {{- with .Values.additionalAnnotations }} {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.deploymentAnnotations.metricsAdapter }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} labels: app: {{ .Values.operator.name }}-metrics-apiserver app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver {{- include "keda.labels" . | indent 4 }} + {{- with .Values.deploymentLabels.metricsAdapter }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: revisionHistoryLimit: {{ .Values.metricsServer.revisionHistoryLimit}} replicas: {{ .Values.metricsServer.replicaCount }} diff --git a/keda/templates/webhooks/deployment.yaml b/keda/templates/webhooks/deployment.yaml index 5aaed6882..16e9d795e 100644 --- a/keda/templates/webhooks/deployment.yaml +++ b/keda/templates/webhooks/deployment.yaml @@ -4,15 +4,23 @@ kind: Deployment metadata: name: {{ .Values.webhooks.name }} namespace: {{ .Release.Namespace }} - {{- with .Values.additionalAnnotations }} + {{- if or .Values.additionalAnnotations .Values.deploymentAnnotations.webhooks }} annotations: + {{- with .Values.additionalAnnotations }} {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.deploymentAnnotations.webhooks }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} labels: app: {{ .Values.webhooks.name }} name: {{ .Values.webhooks.name }} app.kubernetes.io/name: {{ .Values.webhooks.name }} {{- include "keda.labels" . | indent 4 }} + {{- with .Values.deploymentLabels.webhooks }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: revisionHistoryLimit: {{ .Values.webhooks.revisionHistoryLimit}} replicas: {{ .Values.webhooks.replicaCount}} diff --git a/keda/values.yaml b/keda/values.yaml index 024c5a42e..022524d24 100644 --- a/keda/values.yaml +++ b/keda/values.yaml @@ -319,6 +319,20 @@ podLabels: metricsAdapter: {} # -- Pod labels for KEDA Admission webhooks webhooks: {} +deploymentAnnotations: + # -- Deployment annotations for KEDA operator + keda: {} + # -- Deployment annotations for KEDA Metrics Adapter + metricsAdapter: {} + # -- Deployment annotations for KEDA Admission webhooks + webhooks: {} +deploymentLabels: + # -- Deployment labels for KEDA operator + keda: {} + # -- Deployment labels for KEDA Metrics Adapter + metricsAdapter: {} + # -- Deployment labels for KEDA Admission webhooks + webhooks: {} rbac: # -- Specifies whether RBAC should be used