Skip to content

fix: Update kubectl and busybox image order #1270

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

Merged
tuteng merged 2 commits into from
Apr 27, 2026
Merged

fix: Update kubectl and busybox image order #1270

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
50ced16
Update kubectl and busybox image order
tuteng Apr 27, 2026
10f9b90
Fixed
tuteng Apr 27, 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
80 changes: 52 additions & 28 deletions charts/sn-platform-slim/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,83 @@

{{/*
Resolve busybox image fields with backward compatibility.
Prefer deprecated .Values.images.toolset.busybox when present so existing overrides
continue to work after top-level defaults are introduced.
Prefer top-level .Values.images.busybox when present and fall back to deprecated
.Values.images.toolset.busybox for backward compatibility.
*/}}
{{- define "pulsar.images.busybox.repository" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "busybox") .Values.images.toolset.busybox.repository -}}
{{- .Values.images.toolset.busybox.repository -}}
{{- else if and (hasKey .Values.images "busybox") .Values.images.busybox.repository -}}
{{- .Values.images.busybox.repository -}}
{{- $images := .Values.images | default dict -}}
{{- $busybox := get $images "busybox" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetBusybox := get $toolset "busybox" | default dict -}}
{{- if get $busybox "repository" -}}
{{- get $busybox "repository" -}}
{{- else if get $toolsetBusybox "repository" -}}
{{- get $toolsetBusybox "repository" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.busybox.tag" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "busybox") .Values.images.toolset.busybox.tag -}}
{{- .Values.images.toolset.busybox.tag -}}
{{- else if and (hasKey .Values.images "busybox") .Values.images.busybox.tag -}}
{{- .Values.images.busybox.tag -}}
{{- $images := .Values.images | default dict -}}
{{- $busybox := get $images "busybox" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetBusybox := get $toolset "busybox" | default dict -}}
{{- if get $busybox "tag" -}}
{{- get $busybox "tag" -}}
{{- else if get $toolsetBusybox "tag" -}}
{{- get $toolsetBusybox "tag" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.busybox.pullPolicy" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "busybox") .Values.images.toolset.busybox.pullPolicy -}}
{{- .Values.images.toolset.busybox.pullPolicy -}}
{{- else if and (hasKey .Values.images "busybox") .Values.images.busybox.pullPolicy -}}
{{- .Values.images.busybox.pullPolicy -}}
{{- $images := .Values.images | default dict -}}
{{- $busybox := get $images "busybox" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetBusybox := get $toolset "busybox" | default dict -}}
{{- if get $busybox "pullPolicy" -}}
{{- get $busybox "pullPolicy" -}}
{{- else if get $toolsetBusybox "pullPolicy" -}}
{{- get $toolsetBusybox "pullPolicy" -}}
{{- end -}}
{{- end -}}

{{/*
Resolve kubectl image fields with backward compatibility.
Prefer deprecated .Values.images.toolset.kubectl when present so existing overrides
continue to work after top-level defaults are introduced.
Prefer top-level .Values.images.kubectl when present and fall back to deprecated
.Values.images.toolset.kubectl for backward compatibility.
*/}}
{{- define "pulsar.images.kubectl.repository" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "kubectl") .Values.images.toolset.kubectl.repository -}}
{{- .Values.images.toolset.kubectl.repository -}}
{{- else if and (hasKey .Values.images "kubectl") .Values.images.kubectl.repository -}}
{{- .Values.images.kubectl.repository -}}
{{- $images := .Values.images | default dict -}}
{{- $kubectl := get $images "kubectl" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetKubectl := get $toolset "kubectl" | default dict -}}
{{- if get $kubectl "repository" -}}
{{- get $kubectl "repository" -}}
{{- else if get $toolsetKubectl "repository" -}}
{{- get $toolsetKubectl "repository" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.kubectl.tag" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "kubectl") .Values.images.toolset.kubectl.tag -}}
{{- .Values.images.toolset.kubectl.tag -}}
{{- else if and (hasKey .Values.images "kubectl") .Values.images.kubectl.tag -}}
{{- .Values.images.kubectl.tag -}}
{{- $images := .Values.images | default dict -}}
{{- $kubectl := get $images "kubectl" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetKubectl := get $toolset "kubectl" | default dict -}}
{{- if get $kubectl "tag" -}}
{{- get $kubectl "tag" -}}
{{- else if get $toolsetKubectl "tag" -}}
{{- get $toolsetKubectl "tag" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.kubectl.pullPolicy" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "kubectl") .Values.images.toolset.kubectl.pullPolicy -}}
{{- .Values.images.toolset.kubectl.pullPolicy -}}
{{- else if and (hasKey .Values.images "kubectl") .Values.images.kubectl.pullPolicy -}}
{{- .Values.images.kubectl.pullPolicy -}}
{{- $images := .Values.images | default dict -}}
{{- $kubectl := get $images "kubectl" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetKubectl := get $toolset "kubectl" | default dict -}}
{{- if get $kubectl "pullPolicy" -}}
{{- get $kubectl "pullPolicy" -}}
{{- else if get $toolsetKubectl "pullPolicy" -}}
{{- get $toolsetKubectl "pullPolicy" -}}
{{- end -}}
{{- end -}}

Expand Down
80 changes: 52 additions & 28 deletions charts/sn-platform/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,83 @@

{{/*
Resolve busybox image fields with backward compatibility.
Prefer deprecated .Values.images.toolset.busybox when present so existing overrides
continue to work after top-level defaults are introduced.
Prefer top-level .Values.images.busybox when present and fall back to deprecated
.Values.images.toolset.busybox for backward compatibility.
*/}}
{{- define "pulsar.images.busybox.repository" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "busybox") .Values.images.toolset.busybox.repository -}}
{{- .Values.images.toolset.busybox.repository -}}
{{- else if and (hasKey .Values.images "busybox") .Values.images.busybox.repository -}}
{{- .Values.images.busybox.repository -}}
{{- $images := .Values.images | default dict -}}
{{- $busybox := get $images "busybox" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetBusybox := get $toolset "busybox" | default dict -}}
{{- if get $busybox "repository" -}}
{{- get $busybox "repository" -}}
{{- else if get $toolsetBusybox "repository" -}}
{{- get $toolsetBusybox "repository" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.busybox.tag" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "busybox") .Values.images.toolset.busybox.tag -}}
{{- .Values.images.toolset.busybox.tag -}}
{{- else if and (hasKey .Values.images "busybox") .Values.images.busybox.tag -}}
{{- .Values.images.busybox.tag -}}
{{- $images := .Values.images | default dict -}}
{{- $busybox := get $images "busybox" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetBusybox := get $toolset "busybox" | default dict -}}
{{- if get $busybox "tag" -}}
{{- get $busybox "tag" -}}
{{- else if get $toolsetBusybox "tag" -}}
{{- get $toolsetBusybox "tag" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.busybox.pullPolicy" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "busybox") .Values.images.toolset.busybox.pullPolicy -}}
{{- .Values.images.toolset.busybox.pullPolicy -}}
{{- else if and (hasKey .Values.images "busybox") .Values.images.busybox.pullPolicy -}}
{{- .Values.images.busybox.pullPolicy -}}
{{- $images := .Values.images | default dict -}}
{{- $busybox := get $images "busybox" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetBusybox := get $toolset "busybox" | default dict -}}
{{- if get $busybox "pullPolicy" -}}
{{- get $busybox "pullPolicy" -}}
{{- else if get $toolsetBusybox "pullPolicy" -}}
{{- get $toolsetBusybox "pullPolicy" -}}
{{- end -}}
{{- end -}}

{{/*
Resolve kubectl image fields with backward compatibility.
Prefer deprecated .Values.images.toolset.kubectl when present so existing overrides
continue to work after top-level defaults are introduced.
Prefer top-level .Values.images.kubectl when present and fall back to deprecated
.Values.images.toolset.kubectl for backward compatibility.
*/}}
{{- define "pulsar.images.kubectl.repository" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "kubectl") .Values.images.toolset.kubectl.repository -}}
{{- .Values.images.toolset.kubectl.repository -}}
{{- else if and (hasKey .Values.images "kubectl") .Values.images.kubectl.repository -}}
{{- .Values.images.kubectl.repository -}}
{{- $images := .Values.images | default dict -}}
{{- $kubectl := get $images "kubectl" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetKubectl := get $toolset "kubectl" | default dict -}}
{{- if get $kubectl "repository" -}}
{{- get $kubectl "repository" -}}
{{- else if get $toolsetKubectl "repository" -}}
{{- get $toolsetKubectl "repository" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.kubectl.tag" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "kubectl") .Values.images.toolset.kubectl.tag -}}
{{- .Values.images.toolset.kubectl.tag -}}
{{- else if and (hasKey .Values.images "kubectl") .Values.images.kubectl.tag -}}
{{- .Values.images.kubectl.tag -}}
{{- $images := .Values.images | default dict -}}
{{- $kubectl := get $images "kubectl" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetKubectl := get $toolset "kubectl" | default dict -}}
{{- if get $kubectl "tag" -}}
{{- get $kubectl "tag" -}}
{{- else if get $toolsetKubectl "tag" -}}
{{- get $toolsetKubectl "tag" -}}
{{- end -}}
{{- end -}}

{{- define "pulsar.images.kubectl.pullPolicy" -}}
{{- if and (hasKey .Values.images "toolset") (hasKey .Values.images.toolset "kubectl") .Values.images.toolset.kubectl.pullPolicy -}}
{{- .Values.images.toolset.kubectl.pullPolicy -}}
{{- else if and (hasKey .Values.images "kubectl") .Values.images.kubectl.pullPolicy -}}
{{- .Values.images.kubectl.pullPolicy -}}
{{- $images := .Values.images | default dict -}}
{{- $kubectl := get $images "kubectl" | default dict -}}
{{- $toolset := get $images "toolset" | default dict -}}
{{- $toolsetKubectl := get $toolset "kubectl" | default dict -}}
{{- if get $kubectl "pullPolicy" -}}
{{- get $kubectl "pullPolicy" -}}
{{- else if get $toolsetKubectl "pullPolicy" -}}
{{- get $toolsetKubectl "pullPolicy" -}}
{{- end -}}
{{- end -}}

Expand Down
Loading