Skip to content

Fixed busybox and kubectl image #1269

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 22, 2026
Merged

Fixed busybox and kubectl image #1269

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
1f2a0f7
Fixed busybox and kubectl image
tuteng Apr 21, 2026
741f013
Fixed comment
tuteng Apr 21, 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
58 changes: 58 additions & 0 deletions charts/sn-platform-slim/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,63 @@
{{/* vim: set filetype=mustache: */}}

{{/*
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.
*/}}
{{- 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 -}}
{{- 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 -}}
{{- 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 -}}
{{- 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.
*/}}
{{- 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 -}}
{{- 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 -}}
{{- 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 -}}
{{- end -}}
{{- end -}}

{{/*
pulsar home
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/sn-platform-slim/templates/toolset/jwt-secret-init-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ spec:
emptyDir: {}
initContainers:
- name: "kubectl"
image: "{{ .Values.images.toolset.kubectl.repository }}:{{ .Values.images.toolset.kubectl.tag }}"
imagePullPolicy: {{ .Values.images.toolset.kubectl.pullPolicy }}
image: "{{ include "pulsar.images.kubectl.repository" . }}:{{ include "pulsar.images.kubectl.tag" . }}"
imagePullPolicy: {{ include "pulsar.images.kubectl.pullPolicy" . }}
command: ["cp", "/opt/bitnami/kubectl/bin/kubectl", "/tmp/binaries"]
{{- if .Values.toolset.resources }}
resources:
Expand Down
6 changes: 3 additions & 3 deletions charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ spec:
{{- end }}
{{- if .Values.toolset.installBusybox }}
- name: busybox
image: "{{ .Values.images.toolset.busybox.repository }}:{{ .Values.images.toolset.busybox.tag }}"
imagePullPolicy: {{ .Values.images.toolset.busybox.pullPolicy }}
image: "{{ include "pulsar.images.busybox.repository" . }}:{{ include "pulsar.images.busybox.tag" . }}"
imagePullPolicy: {{ include "pulsar.images.busybox.pullPolicy" . }}
{{- if .Values.toolset.resources }}
resources:
{{ toYaml .Values.toolset.resources | indent 10 }}
Expand Down Expand Up @@ -192,4 +192,4 @@ spec:
{{- if .Values.toolset.serviceAccount.use }}
serviceAccountName: {{ include "pulsar.toolset.serviceAccount" . }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/sn-platform-slim/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,12 @@ images:
repository: streamnative/sn-platform-slim
tag: "3.3.3.3"
pullPolicy: IfNotPresent
# deprecated: use images.busybox instead
busybox:
repository: busybox
tag: "1.36.1-uclibc"
pullPolicy: IfNotPresent
# deprecated: use images.kubectl instead
kubectl:
repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl
tag: "1.28.3"
Expand Down
58 changes: 58 additions & 0 deletions charts/sn-platform/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,63 @@
{{/* vim: set filetype=mustache: */}}

{{/*
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.
*/}}
{{- 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 -}}
{{- 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 -}}
{{- 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 -}}
{{- 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.
*/}}
{{- 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 -}}
{{- 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 -}}
{{- 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 -}}
{{- end -}}
{{- end -}}

{{/*
pulsar home
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/sn-platform/templates/toolset/jwt-secret-init-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ spec:
emptyDir: {}
initContainers:
- name: "kubectl"
image: "{{ .Values.images.toolset.kubectl.repository }}:{{ .Values.images.toolset.kubectl.tag }}"
imagePullPolicy: {{ .Values.images.toolset.kubectl.pullPolicy }}
image: "{{ include "pulsar.images.kubectl.repository" . }}:{{ include "pulsar.images.kubectl.tag" . }}"
imagePullPolicy: {{ include "pulsar.images.kubectl.pullPolicy" . }}
command: ["cp", "/opt/bitnami/kubectl/bin/kubectl", "/tmp/binaries"]
{{- if .Values.toolset.resources }}
resources:
Expand Down
4 changes: 2 additions & 2 deletions charts/sn-platform/templates/toolset/toolset-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ spec:
{{- end }}
{{- if .Values.toolset.installBusybox }}
- name: busybox
image: "{{ .Values.images.toolset.busybox.repository }}:{{ .Values.images.toolset.busybox.tag }}"
imagePullPolicy: {{ .Values.images.toolset.busybox.pullPolicy }}
image: "{{ include "pulsar.images.busybox.repository" . }}:{{ include "pulsar.images.busybox.tag" . }}"
imagePullPolicy: {{ include "pulsar.images.busybox.pullPolicy" . }}
{{- if .Values.toolset.resources }}
resources:
{{ toYaml .Values.toolset.resources | indent 10 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/sn-platform/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,12 @@ images:
repository: bitnami/kafka
tag: "3.5.1"
pullPolicy: IfNotPresent
# deprecated: use images.busybox instead
busybox:
repository: busybox
tag: "1.36.1-uclibc"
pullPolicy: IfNotPresent
# deprecated: use images.kubectl instead
kubectl:
repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl
tag: "1.28.3"
Expand Down
Loading