Skip to content

feat(job, cronjob): reuse the same envFrom configuration as in the Deployment. #462

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(job, cronjob): reuse the same envFrom configuration as in the Deployment. #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59dd634
feat(cronjob): reuse the same envFrom configuration as in the Deploym…
lucaspouzac Oct 13, 2025
ff8948e
Add examples, tests, and same processing on jobs
lucaspouzac Oct 15, 2025
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
25 changes: 23 additions & 2 deletions application/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,30 @@ spec:
{{ include "application.tplvalues.render" ( dict "value" $value "context" $ ) | indent 14 }}
{{- end }}
{{- end }}
{{- with $job.envFrom }}
envFrom:
{{ toYaml . | indent 12 }}
{{- range $value := $job.envFrom }}
{{- if (eq .type "configmap") }}
- configMapRef:
{{- if .name }}
name: {{ include "application.tplvalues.render" ( dict "value" $value.name "context" $ ) }}
{{- else if .nameSuffix }}
name: {{ template "application.name" $ }}-{{ include "application.tplvalues.render" ( dict "value" $value.nameSuffix "context" $ ) }}
{{- else }}
name: {{ template "application.name" $ }}
{{- end }}
optional: {{ default false $value.optional }}
{{- end }}
{{- if (eq .type "secret") }}
- secretRef:
{{- if .name }}
name: {{ include "application.tplvalues.render" ( dict "value" $value.name "context" $ ) }}
{{- else if .nameSuffix }}
name: {{ template "application.name" $ }}-{{ include "application.tplvalues.render" ( dict "value" $value.nameSuffix "context" $ ) }}
{{- else }}
name: {{ template "application.name" $ }}
{{- end }}
optional: {{ default false $value.optional }}
{{- end }}
{{- end }}
{{- if $job.command }}
command: {{ $job.command }}
Expand Down
25 changes: 23 additions & 2 deletions application/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,30 @@ spec:
{{ include "application.tplvalues.render" ( dict "value" $value "context" $ ) | indent 10 }}
{{- end }}
{{- end }}
{{- with $job.envFrom }}
envFrom:
{{ toYaml . | indent 8 }}
{{- range $value := $job.envFrom }}
{{- if (eq .type "configmap") }}
- configMapRef:
{{- if .name }}
name: {{ include "application.tplvalues.render" ( dict "value" $value.name "context" $ ) }}
{{- else if .nameSuffix }}
name: {{ template "application.name" $ }}-{{ include "application.tplvalues.render" ( dict "value" $value.nameSuffix "context" $ ) }}
{{- else }}
name: {{ template "application.name" $ }}
{{- end }}
optional: {{ default false $value.optional }}
{{- end }}
{{- if (eq .type "secret") }}
- secretRef:
{{- if .name }}
name: {{ include "application.tplvalues.render" ( dict "value" $value.name "context" $ ) }}
{{- else if .nameSuffix }}
name: {{ template "application.name" $ }}-{{ include "application.tplvalues.render" ( dict "value" $value.nameSuffix "context" $ ) }}
{{- else }}
name: {{ template "application.name" $ }}
{{- end }}
optional: {{ default false $value.optional }}
{{- end }}
{{- end }}
{{- if $job.command }}
command: {{ $job.command }}
Expand Down
86 changes: 86 additions & 0 deletions application/tests/cronjob_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,89 @@ tests:
content:
name: shouldnotmatter
image: example-image:example-tag

- it: configures envFrom as mandatory by default (as secret)
set:
cronJob:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-secret:
type: secret
name: foo
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].secretRef.name
value: foo
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].secretRef.optional
value: false

- it: configures envFrom as optional when configured (as secret)
set:
cronJob:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-secret:
type: secret
name: foo
optional: true
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].secretRef.name
value: foo
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].secretRef.optional
value: true

- it: configures envFrom as mandatory by default (as configmap)
set:
cronJob:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-configmap:
type: configmap
name: foo
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].configMapRef.name
value: foo
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].configMapRef.optional
value: false

- it: configures envFrom as optional when configured (as configmap)
set:
cronJob:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-configmap:
type: configmap
name: foo
optional: true
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].configMapRef.name
value: foo
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].envFrom[0].configMapRef.optional
value: true
33 changes: 31 additions & 2 deletions application/tests/deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ tests:
path: spec.template.spec.containers[0].livenessProbe.grpc.port
value: 5000

- it: configures envFrom as mandatory by default
- it: configures envFrom as mandatory by default (as secret)
set:
deployment.envFrom:
foo-secret:
Expand All @@ -148,7 +148,7 @@ tests:
path: spec.template.spec.containers[0].envFrom[0].secretRef.optional
value: false

- it: configures envFrom as optional when configured
- it: configures envFrom as optional when configured (as secret)
set:
deployment.envFrom:
foo-secret:
Expand All @@ -162,3 +162,32 @@ tests:
- equal:
path: spec.template.spec.containers[0].envFrom[0].secretRef.optional
value: true

- it: configures envFrom as mandatory by default (as configmap)
set:
deployment.envFrom:
foo-configmap:
type: configmap
name: foo
asserts:
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.name
value: foo
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.optional
value: false

- it: configures envFrom as optional when configured (as configmap)
set:
deployment.envFrom:
foo-configmap:
type: configmap
name: foo
optional: true
asserts:
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.name
value: foo
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.optional
value: true
86 changes: 86 additions & 0 deletions application/tests/job_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,89 @@ tests:
content:
name: shouldnotmatter
image: example-image:example-tag

- it: configures envFrom as mandatory by default (as secret)
set:
job:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-secret:
type: secret
name: foo
asserts:
- equal:
path: spec.template.spec.containers[0].envFrom[0].secretRef.name
value: foo
- equal:
path: spec.template.spec.containers[0].envFrom[0].secretRef.optional
value: false

- it: configures envFrom as optional when configured (as secret)
set:
job:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-secret:
type: secret
name: foo
optional: true
asserts:
- equal:
path: spec.template.spec.containers[0].envFrom[0].secretRef.name
value: foo
- equal:
path: spec.template.spec.containers[0].envFrom[0].secretRef.optional
value: true

- it: configures envFrom as mandatory by default (as configmap)
set:
job:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-configmap:
type: configmap
name: foo
asserts:
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.name
value: foo
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.optional
value: false

- it: configures envFrom as optional when configured (as configmap)
set:
job:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
envFrom:
foo-configmap:
type: configmap
name: foo
optional: true
asserts:
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.name
value: foo
- equal:
path: spec.template.spec.containers[0].envFrom[0].configMapRef.optional
value: true
26 changes: 26 additions & 0 deletions application/values-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,19 @@ cronJob:
image:
repository: docker.io/nginx
tag: v1.0.0
# If want to mount Envs from configmap or secret
envFrom:
production-cm:
type: configmap
nameSuffix: my-configmap
postgres-config:
type: secret
nameSuffix: postgres
optional: false
nonexisting-config:
type: secret
nameSuffix: nonexisting
optional: true
env:
KEY:
value: VALUE
Expand Down Expand Up @@ -1341,6 +1354,19 @@ job:
image:
repository: docker.io/nginx
tag: v1.0.0
# If want to mount Envs from configmap or secret
envFrom:
production-cm:
type: configmap
nameSuffix: my-configmap
postgres-config:
type: secret
nameSuffix: postgres
optional: false
nonexisting-config:
type: secret
nameSuffix: nonexisting
optional: true
env:
KEY:
value: VALUE
Expand Down
24 changes: 24 additions & 0 deletions application/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ cronJob:
# priorityClassName: high-priority
# startingDeadlineSeconds: 0
# activeDeadlineSeconds: 0
# envFrom:
# production-cm:
# type: configmap
# nameSuffix: my-configmap
# postgres-config:
# type: secret
# nameSuffix: postgres
# optional: false
# optional-config:
# type: secret
# nameSuffix: extra
# optional: true
# env:
# KEY:
# value: VALUE
Expand Down Expand Up @@ -87,6 +99,18 @@ job:
# helm.sh/hook-delete-policy: "before-hook-creation"
# startingDeadlineSeconds: 0
# activeDeadlineSeconds: 0
# envFrom:
# production-cm:
# type: configmap
# nameSuffix: my-configmap
# postgres-config:
# type: secret
# nameSuffix: postgres
# optional: false
# optional-config:
# type: secret
# nameSuffix: extra
# optional: true
# env:
# KEY:
# value: VALUE
Expand Down
Loading