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.

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

support extraEnvs for job resources in helm chart #8545

Merged
merged 9 commits into from
Jun 21, 2022
Merged

support extraEnvs for job resources in helm chart #8545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f051ee0
support extraEnvs for job resources in helm chart
May 4, 2022
4a7981e
Update helm doc
May 4, 2022
1c43936
Update helm doc
May 4, 2022
153a927
Updated helm doc - add controller.admissionWebhooks.extraEnvs
May 4, 2022
234417f
Added some test data for webhook controller.admissionWebhooks.extraEnvs
May 21, 2022
697fd43
added new line at the end of deployment-webhook-extraEnvs-values.yaml
May 21, 2022
452e112
Merge branch 'kubernetes:main' into added-extraevnvar-to-job-resource
Eric84626 May 21, 2022
0e7a201
Fixed helm chart test issue
May 21, 2022
bd49cfa
Merge branch 'added-extraevnvar-to-job-resource' of https://github.co…
May 21, 2022
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
1 change: 1 addition & 0 deletions charts/ingress-nginx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ Kubernetes: `>=1.19.0-0`
| controller.admissionWebhooks.createSecretJob.resources | object | `{}` | |
| controller.admissionWebhooks.enabled | bool | `true` | |
| controller.admissionWebhooks.existingPsp | string | `""` | Use an existing PSP instead of creating one |
| controller.admissionWebhooks.extraEnvs | list | `[]` | Additional environment variables to set |
| controller.admissionWebhooks.failurePolicy | string | `"Fail"` | |
| controller.admissionWebhooks.key | string | `"/usr/local/certificates/key"` | |
| controller.admissionWebhooks.labels | object | `{}` | Labels to be added to admission webhooks |
Expand Down
12 changes: 12 additions & 0 deletions charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
controller:
service:
type: ClusterIP
admissionWebhooks:
enabled: true
extraEnvs:
- name: FOO
value: foo
- name: TEST
value: test
patch:
enabled: true
3 changes: 3 additions & 0 deletions charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- if .Values.controller.admissionWebhooks.extraEnvs }}
{{- toYaml .Values.controller.admissionWebhooks.extraEnvs | nindent 12 }}
{{- end }}
securityContext:
allowPrivilegeEscalation: false
{{- if .Values.controller.admissionWebhooks.createSecretJob.resources }}
Expand Down
3 changes: 3 additions & 0 deletions charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- if .Values.controller.admissionWebhooks.extraEnvs }}
{{- toYaml .Values.controller.admissionWebhooks.extraEnvs | nindent 12 }}
{{- end }}
securityContext:
allowPrivilegeEscalation: false
{{- if .Values.controller.admissionWebhooks.patchWebhookJob.resources }}
Expand Down
8 changes: 8 additions & 0 deletions charts/ingress-nginx/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,14 @@ controller:
## These annotations will be added to the ValidatingWebhookConfiguration and
## the Jobs Spec of the admission webhooks.
enabled: true
# -- Additional environment variables to set
extraEnvs: []
# extraEnvs:
# - name: FOO
# valueFrom:
# secretKeyRef:
# key: FOO
# name: secret-resource
failurePolicy: Fail
# timeoutSeconds: 10
port: 8443
Expand Down