1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-04-09 18:52:36 +00:00

Support setting global extraEnvVars (#9269)

Fixes #9243

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
This commit is contained in:
treydock 2023-12-22 17:07:11 -05:00 committed by GitHub
parent 2b5aef75f1
commit 8308a6c69c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 5 deletions

View file

@ -727,6 +727,7 @@ The chart values are organised per component.
| global.image.registry | string | `nil` | Global value that allows to set a single image registry across all deployments. When set, it will override any values set under `.image.registry` across the chart. |
| global.caCertificates.data | string | `nil` | Global CA certificates to use with Kyverno deployments This value is expected to be one large string of CA certificates Individual controller values will override this global value |
| global.caCertificates.volume | object | `{}` | Global value to set single volume to be mounted for CA certificates for all deployments. Not used when `.Values.global.caCertificates.data` is defined Individual controller values will override this global value |
| global.extraEnvVars | list | `[]` | Additional container environment variables to apply to all containers and init containers |
| nameOverride | string | `nil` | Override the name of the chart |
| fullnameOverride | string | `nil` | Override the expanded name of the chart |
| namespaceOverride | string | `nil` | Override the namespace the chart deploys to |

View file

@ -117,7 +117,7 @@ spec:
value: {{ template "kyverno.admission-controller.name" . }}
- name: KYVERNO_SVC
value: {{ template "kyverno.admission-controller.serviceName" . }}
{{- with .Values.admissionController.initContainer.extraEnvVars }}
{{- with (concat .Values.global.extraEnvVars .Values.admissionController.initContainer.extraEnvVars) }}
{{- toYaml . | nindent 10 }}
{{- end }}
containers:
@ -209,7 +209,7 @@ spec:
value: {{ template "kyverno.admission-controller.serviceName" . }}
- name: TUF_ROOT
value: {{ .Values.admissionController.tufRootMountPath }}
{{- with .Values.admissionController.container.extraEnvVars }}
{{- with (concat .Values.global.extraEnvVars .Values.admissionController.container.extraEnvVars) }}
{{- toYaml . | nindent 10 }}
{{- end }}
- name: KYVERNO_DEPLOYMENT

View file

@ -138,7 +138,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- with .Values.backgroundController.extraEnvVars }}
{{- with (concat .Values.global.extraEnvVars .Values.backgroundController.extraEnvVars) }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- with .Values.backgroundController.resources }}

View file

@ -141,7 +141,7 @@ spec:
fieldPath: metadata.namespace
- name: KYVERNO_SVC
value: {{ template "kyverno.cleanup-controller.name" . }}
{{- with .Values.cleanupController.extraEnvVars }}
{{- with (concat .Values.global.extraEnvVars .Values.cleanupController.extraEnvVars) }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- with .Values.cleanupController.resources }}

View file

@ -148,7 +148,7 @@ spec:
fieldPath: metadata.namespace
- name: TUF_ROOT
value: {{ .Values.reportsController.tufRootMountPath }}
{{- with .Values.reportsController.extraEnvVars }}
{{- with (concat .Values.global.extraEnvVars .Values.reportsController.extraEnvVars) }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- with .Values.reportsController.resources }}

View file

@ -23,6 +23,12 @@ global:
# hostPath:
# path: /etc/pki/tls/ca-certificates.crt
# type: File
# -- Additional container environment variables to apply to all containers and init containers
extraEnvVars: []
# Example setting proxy
# extraEnvVars:
# - name: HTTPS_PROXY
# value: 'https://proxy.example.com:3128'
# -- (string) Override the name of the chart
nameOverride: ~