Skip to content

fix: nil value handling in tplvalues.render helper #486

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
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+54 −5
Open

fix: nil value handling in tplvalues.render helper #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19c7f0d
Initial plan
Copilot Feb 3, 2026
df969bc
Fix image digest @null rendering across deployment, job, and cronjob …
Copilot Feb 3, 2026
84e6a34
Better fix: Update tplvalues.render helper to handle nil values corre…
Copilot Feb 3, 2026
3b22c24
Remove redundant null checks from templates - helper fix is sufficient
Copilot Feb 3, 2026
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
13 changes: 8 additions & 5 deletions application/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ Usage:
{{ include "application.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
*/}}
{{- define "application.tplvalues.render" -}}
{{- if typeIs "string" .value }}
{{- tpl .value .context }}
{{- else }}
{{- tpl (.value | toYaml) .context }}
{{- end }}
{{- $value := .value -}}
{{- if or (not $value) (kindIs "invalid" $value) -}}
{{- "" -}}
{{- else if typeIs "string" $value -}}
{{- tpl $value .context -}}
{{- else -}}
{{- tpl ($value | toYaml) .context -}}
{{- end -}}
{{- end -}}

{{/*
Expand Down
17 changes: 17 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 @@ -330,6 +330,23 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].image
value: custom-image

- it: does not render @null when digest field is omitted
set:
cronJob:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].image
value: example-image:example-tag
- notMatchRegex:
path: spec.jobTemplate.spec.template.spec.containers[0].image
pattern: "@null"

- it: configures automount service account token by default
set:
cronJob:
Expand Down
12 changes: 12 additions & 0 deletions application/tests/deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@ tests:
path: spec.template.spec.containers[0].image
value: example-image:example-tag@sha256:example-digest

- it: does not render @null when digest field is omitted
set:
deployment.image.repository: example-image
deployment.image.tag: example-tag
asserts:
- equal:
path: spec.template.spec.containers[0].image
value: example-image:example-tag
- notMatchRegex:
path: spec.template.spec.containers[0].image
pattern: "@null"

- it: yields empty service account name when disabled
set:
rbac.serviceAccount.enabled: false
Expand Down
17 changes: 17 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 @@ -329,6 +329,23 @@ tests:
path: spec.template.spec.containers[0].image
value: custom-image

- it: does not render @null when digest field is omitted
set:
job:
enabled: true
jobs:
example:
image:
repository: example-image
tag: example-tag
asserts:
- equal:
path: spec.template.spec.containers[0].image
value: example-image:example-tag
- notMatchRegex:
path: spec.template.spec.containers[0].image
pattern: "@null"

- it: configures automount service account token by default
set:
job:
Expand Down
Loading