Skip to content
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.

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

Allow image registry override for all keda components #557

Merged
merged 3 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions keda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ their default values.
| `crds.install` | bool | `true` | Defines whether the KEDA CRDs have to be installed or not. |
| `env` | list | `[]` | Additional environment variables that will be passed onto all KEDA components |
| `extraObjects` | list | `[]` | Array of extra K8s manifests to deploy |
| `global.image.registry` | string | `nil` | Global image registry of KEDA components |
| `grpcTLSCertsSecret` | string | `""` | Set this if you are using an external scaler and want to communicate over TLS (recommended). This variable holds the name of the secret that will be mounted to the /grpccerts path on the Pod |
| `hashiCorpVaultTLS` | string | `""` | Set this if you are using HashiCorp Vault and want to communicate over TLS (recommended). This variable holds the name of the secret that will be mounted to the /vault path on the Pod |
| `http.keepAlive.enabled` | bool | `true` | Enable HTTP connection keep alive |
Expand Down Expand Up @@ -110,6 +111,7 @@ their default values.
| Parameter | Type | Default | Description |
|-----------|------|---------|-------------|
| `extraArgs.keda` | object | `{}` | Additional KEDA Operator container arguments |
| `image.keda.registry` | string | `nil` | Image registry of KEDA operator |
| `image.keda.repository` | string | `"ghcr.io/kedacore/keda"` | Image name of KEDA operator |
| `image.keda.tag` | string | `""` | Image tag of KEDA operator. Optional, given app version of Helm chart is used by default |
| `logging.operator.format` | string | `"console"` | Logging format for KEDA Operator. allowed values: `json` or `console` |
Expand Down Expand Up @@ -138,6 +140,7 @@ their default values.
| Parameter | Type | Default | Description |
|-----------|------|---------|-------------|
| `extraArgs.metricsAdapter` | object | `{}` | Additional Metrics Adapter container arguments |
| `image.metricsApiServer.registry` | string | `nil` | Image registry of KEDA Metrics API Server |
| `image.metricsApiServer.repository` | string | `"ghcr.io/kedacore/keda-metrics-apiserver"` | Image name of KEDA Metrics API Server |
| `image.metricsApiServer.tag` | string | `""` | Image tag of KEDA Metrics API Server. Optional, given app version of Helm chart is used by default |
| `logging.metricServer.level` | int | `0` | Logging level for Metrics Server. allowed values: `0` for info, `4` for debug, or an integer value greater than 0, specified as string |
Expand Down Expand Up @@ -247,6 +250,7 @@ their default values.

| Parameter | Type | Default | Description |
|-----------|------|---------|-------------|
| `image.webhooks.registry` | string | `nil` | Image registry of KEDA admission-webhooks |
| `image.webhooks.repository` | string | `"ghcr.io/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 |
| `logging.webhooks.format` | string | `"console"` | Logging format for KEDA Admission webhooks. allowed values: `json` or `console` |
Expand Down
5 changes: 5 additions & 0 deletions keda/templates/manager/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ spec:
{{- else }}
{{- toYaml .Values.securityContext | nindent 12 }}
{{- end }}
{{- $registry := .Values.global.image.registry | default .Values.image.keda.registry | default "" }}
{{- if $registry }}
image: "{{ $registry }}/{{ .Values.image.keda.repository }}:{{ .Values.image.keda.tag | default .Chart.AppVersion }}"
{{- else }}
image: "{{ .Values.image.keda.repository }}:{{ .Values.image.keda.tag | default .Chart.AppVersion }}"
{{- end }}
command:
- "/keda"
args:
Expand Down
5 changes: 5 additions & 0 deletions keda/templates/metrics-server/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ spec:
{{- else }}
{{- toYaml .Values.securityContext | nindent 12 }}
{{- end }}
{{- $registry := .Values.global.image.registry | default .Values.image.metricsApiServer.registry | default "" }}
{{- if $registry }}
image: "{{ $registry }}/{{ .Values.image.metricsApiServer.repository }}:{{ .Values.image.metricsApiServer.tag | default .Chart.AppVersion }}"
{{- else }}
image: "{{ .Values.image.metricsApiServer.repository }}:{{ .Values.image.metricsApiServer.tag | default .Chart.AppVersion }}"
{{- end }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
livenessProbe:
httpGet:
Expand Down
5 changes: 5 additions & 0 deletions keda/templates/webhooks/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@ spec:
{{- else }}
{{- toYaml .Values.securityContext | nindent 12 }}
{{- end }}
{{- $registry := .Values.global.image.registry | default .Values.image.webhooks.registry | default "" }}
{{- if $registry }}
image: "{{ $registry }}/{{ .Values.image.webhooks.repository }}:{{ .Values.image.webhooks.tag | default .Chart.AppVersion }}"
{{- else }}
image: "{{ .Values.image.webhooks.repository }}:{{ .Values.image.webhooks.tag | default .Chart.AppVersion }}"
{{- end }}
command:
- /keda-admission-webhooks
args:
Expand Down
11 changes: 11 additions & 0 deletions keda/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,29 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

global:
image:
# -- Global image registry of KEDA components
registry: null

image:
keda:
# -- Image registry of KEDA operator
registry: null
# -- Image name of KEDA operator
repository: ghcr.io/kedacore/keda
# -- Image tag of KEDA operator. Optional, given app version of Helm chart is used by default
tag: ""
metricsApiServer:
# -- Image registry of KEDA Metrics API Server
registry: null
# -- Image name of KEDA Metrics API Server
repository: ghcr.io/kedacore/keda-metrics-apiserver
# -- Image tag of KEDA Metrics API Server. Optional, given app version of Helm chart is used by default
tag: ""
webhooks:
# -- Image registry of KEDA admission-webhooks
registry: null
# -- Image name of KEDA admission-webhooks
repository: ghcr.io/kedacore/keda-admission-webhooks
# -- Image tag of KEDA admission-webhooks . Optional, given app version of Helm chart is used by default
Expand Down
Loading