Skip to content

feat: support per-component Deployment labels and annotations #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
somaz94 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: support per-component Deployment labels and annotations #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions keda/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down
10 changes: 9 additions & 1 deletion keda/templates/manager/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
10 changes: 9 additions & 1 deletion keda/templates/metrics-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
10 changes: 9 additions & 1 deletion keda/templates/webhooks/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
14 changes: 14 additions & 0 deletions keda/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down