From 1f2a0f7e301c5f468d5e0117b885d0c31ffc66c5 Mon Sep 17 00:00:00 2001 From: Guangning E Date: Tue, 21 Apr 2026 15:27:31 +0800 Subject: [PATCH 1/2] Fixed busybox and kubectl image --- .../sn-platform-slim/templates/_helpers.tpl | 32 +++++++++++++++++++ .../toolset/jwt-secret-init-job.yaml | 4 +-- .../toolset/toolset-statefulset.yaml | 6 ++-- charts/sn-platform-slim/values.yaml | 10 ++++++ charts/sn-platform/templates/_helpers.tpl | 32 +++++++++++++++++++ .../toolset/jwt-secret-init-job.yaml | 4 +-- .../toolset/toolset-statefulset.yaml | 4 +-- charts/sn-platform/values.yaml | 10 ++++++ 8 files changed, 93 insertions(+), 9 deletions(-) diff --git a/charts/sn-platform-slim/templates/_helpers.tpl b/charts/sn-platform-slim/templates/_helpers.tpl index 55ed3faa2..95646ef17 100644 --- a/charts/sn-platform-slim/templates/_helpers.tpl +++ b/charts/sn-platform-slim/templates/_helpers.tpl @@ -1,5 +1,37 @@ {{/* vim: set filetype=mustache: */}} +{{/* +Resolve busybox image fields with backward compatibility. +Prefer .Values.images.busybox and fall back to deprecated .Values.images.toolset.busybox. +*/}} +{{- define "pulsar.images.busybox.repository" -}} +{{- coalesce .Values.images.busybox.repository (dig "toolset" "busybox" "repository" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.busybox.tag" -}} +{{- coalesce .Values.images.busybox.tag (dig "toolset" "busybox" "tag" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.busybox.pullPolicy" -}} +{{- coalesce .Values.images.busybox.pullPolicy (dig "toolset" "busybox" "pullPolicy" "" .Values.images) -}} +{{- end -}} + +{{/* +Resolve kubectl image fields with backward compatibility. +Prefer .Values.images.kubectl and fall back to deprecated .Values.images.toolset.kubectl. +*/}} +{{- define "pulsar.images.kubectl.repository" -}} +{{- coalesce .Values.images.kubectl.repository (dig "toolset" "kubectl" "repository" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.kubectl.tag" -}} +{{- coalesce .Values.images.kubectl.tag (dig "toolset" "kubectl" "tag" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.kubectl.pullPolicy" -}} +{{- coalesce .Values.images.kubectl.pullPolicy (dig "toolset" "kubectl" "pullPolicy" "" .Values.images) -}} +{{- end -}} + {{/* pulsar home */}} diff --git a/charts/sn-platform-slim/templates/toolset/jwt-secret-init-job.yaml b/charts/sn-platform-slim/templates/toolset/jwt-secret-init-job.yaml index e9a644bc5..a36aef0c2 100644 --- a/charts/sn-platform-slim/templates/toolset/jwt-secret-init-job.yaml +++ b/charts/sn-platform-slim/templates/toolset/jwt-secret-init-job.yaml @@ -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: diff --git a/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml index 739a39078..9b2e869df 100644 --- a/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml +++ b/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml @@ -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 }} @@ -192,4 +192,4 @@ spec: {{- if .Values.toolset.serviceAccount.use }} serviceAccountName: {{ include "pulsar.toolset.serviceAccount" . }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml index 861a99462..945089a98 100644 --- a/charts/sn-platform-slim/values.yaml +++ b/charts/sn-platform-slim/values.yaml @@ -155,14 +155,24 @@ 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" pullPolicy: IfNotPresent + busybox: + repository: busybox + tag: "1.36.1-uclibc" + pullPolicy: IfNotPresent + kubectl: + repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl + tag: "1.28.3" + pullPolicy: IfNotPresent prometheus: repository: quay.io/prometheus/prometheus tag: "v2.43.0" diff --git a/charts/sn-platform/templates/_helpers.tpl b/charts/sn-platform/templates/_helpers.tpl index 964e97ea3..4631bbf81 100644 --- a/charts/sn-platform/templates/_helpers.tpl +++ b/charts/sn-platform/templates/_helpers.tpl @@ -1,5 +1,37 @@ {{/* vim: set filetype=mustache: */}} +{{/* +Resolve busybox image fields with backward compatibility. +Prefer .Values.images.busybox and fall back to deprecated .Values.images.toolset.busybox. +*/}} +{{- define "pulsar.images.busybox.repository" -}} +{{- coalesce .Values.images.busybox.repository (dig "toolset" "busybox" "repository" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.busybox.tag" -}} +{{- coalesce .Values.images.busybox.tag (dig "toolset" "busybox" "tag" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.busybox.pullPolicy" -}} +{{- coalesce .Values.images.busybox.pullPolicy (dig "toolset" "busybox" "pullPolicy" "" .Values.images) -}} +{{- end -}} + +{{/* +Resolve kubectl image fields with backward compatibility. +Prefer .Values.images.kubectl and fall back to deprecated .Values.images.toolset.kubectl. +*/}} +{{- define "pulsar.images.kubectl.repository" -}} +{{- coalesce .Values.images.kubectl.repository (dig "toolset" "kubectl" "repository" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.kubectl.tag" -}} +{{- coalesce .Values.images.kubectl.tag (dig "toolset" "kubectl" "tag" "" .Values.images) -}} +{{- end -}} + +{{- define "pulsar.images.kubectl.pullPolicy" -}} +{{- coalesce .Values.images.kubectl.pullPolicy (dig "toolset" "kubectl" "pullPolicy" "" .Values.images) -}} +{{- end -}} + {{/* pulsar home */}} diff --git a/charts/sn-platform/templates/toolset/jwt-secret-init-job.yaml b/charts/sn-platform/templates/toolset/jwt-secret-init-job.yaml index 9aef70a3b..e6896b2d9 100644 --- a/charts/sn-platform/templates/toolset/jwt-secret-init-job.yaml +++ b/charts/sn-platform/templates/toolset/jwt-secret-init-job.yaml @@ -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: diff --git a/charts/sn-platform/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform/templates/toolset/toolset-statefulset.yaml index cbe7118b8..634147f21 100644 --- a/charts/sn-platform/templates/toolset/toolset-statefulset.yaml +++ b/charts/sn-platform/templates/toolset/toolset-statefulset.yaml @@ -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 }} diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml index 3e38dcc7f..610ecf050 100644 --- a/charts/sn-platform/values.yaml +++ b/charts/sn-platform/values.yaml @@ -182,14 +182,24 @@ 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" pullPolicy: IfNotPresent + busybox: + repository: busybox + tag: "1.36.1-uclibc" + pullPolicy: IfNotPresent + kubectl: + repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl + tag: "1.28.3" + pullPolicy: IfNotPresent prometheus: repository: quay.io/prometheus/prometheus tag: "v2.43.0" From 741f013f80e7b2a8de4d2f8583670e90350bdafc Mon Sep 17 00:00:00 2001 From: Guangning E Date: Tue, 21 Apr 2026 15:42:51 +0800 Subject: [PATCH 2/2] Fixed comment --- .../sn-platform-slim/templates/_helpers.tpl | 42 +++++++++++++++---- charts/sn-platform-slim/values.yaml | 8 ---- charts/sn-platform/templates/_helpers.tpl | 42 +++++++++++++++---- charts/sn-platform/values.yaml | 8 ---- 4 files changed, 68 insertions(+), 32 deletions(-) diff --git a/charts/sn-platform-slim/templates/_helpers.tpl b/charts/sn-platform-slim/templates/_helpers.tpl index 95646ef17..9c1900373 100644 --- a/charts/sn-platform-slim/templates/_helpers.tpl +++ b/charts/sn-platform-slim/templates/_helpers.tpl @@ -2,34 +2,60 @@ {{/* Resolve busybox image fields with backward compatibility. -Prefer .Values.images.busybox and fall back to deprecated .Values.images.toolset.busybox. +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" -}} -{{- coalesce .Values.images.busybox.repository (dig "toolset" "busybox" "repository" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.busybox.tag (dig "toolset" "busybox" "tag" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.busybox.pullPolicy (dig "toolset" "busybox" "pullPolicy" "" .Values.images) -}} +{{- 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 .Values.images.kubectl and fall back to deprecated .Values.images.toolset.kubectl. +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" -}} -{{- coalesce .Values.images.kubectl.repository (dig "toolset" "kubectl" "repository" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.kubectl.tag (dig "toolset" "kubectl" "tag" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.kubectl.pullPolicy (dig "toolset" "kubectl" "pullPolicy" "" .Values.images) -}} +{{- 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 -}} {{/* diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml index 945089a98..b21044bfa 100644 --- a/charts/sn-platform-slim/values.yaml +++ b/charts/sn-platform-slim/values.yaml @@ -165,14 +165,6 @@ images: repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl tag: "1.28.3" pullPolicy: IfNotPresent - busybox: - repository: busybox - tag: "1.36.1-uclibc" - pullPolicy: IfNotPresent - kubectl: - repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl - tag: "1.28.3" - pullPolicy: IfNotPresent prometheus: repository: quay.io/prometheus/prometheus tag: "v2.43.0" diff --git a/charts/sn-platform/templates/_helpers.tpl b/charts/sn-platform/templates/_helpers.tpl index 4631bbf81..7fa675e54 100644 --- a/charts/sn-platform/templates/_helpers.tpl +++ b/charts/sn-platform/templates/_helpers.tpl @@ -2,34 +2,60 @@ {{/* Resolve busybox image fields with backward compatibility. -Prefer .Values.images.busybox and fall back to deprecated .Values.images.toolset.busybox. +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" -}} -{{- coalesce .Values.images.busybox.repository (dig "toolset" "busybox" "repository" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.busybox.tag (dig "toolset" "busybox" "tag" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.busybox.pullPolicy (dig "toolset" "busybox" "pullPolicy" "" .Values.images) -}} +{{- 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 .Values.images.kubectl and fall back to deprecated .Values.images.toolset.kubectl. +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" -}} -{{- coalesce .Values.images.kubectl.repository (dig "toolset" "kubectl" "repository" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.kubectl.tag (dig "toolset" "kubectl" "tag" "" .Values.images) -}} +{{- 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" -}} -{{- coalesce .Values.images.kubectl.pullPolicy (dig "toolset" "kubectl" "pullPolicy" "" .Values.images) -}} +{{- 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 -}} {{/* diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml index 610ecf050..0d4004a8d 100644 --- a/charts/sn-platform/values.yaml +++ b/charts/sn-platform/values.yaml @@ -192,14 +192,6 @@ images: repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl tag: "1.28.3" pullPolicy: IfNotPresent - busybox: - repository: busybox - tag: "1.36.1-uclibc" - pullPolicy: IfNotPresent - kubectl: - repository: docker-proxy.streamnative.io/bitnamilegacy/kubectl - tag: "1.28.3" - pullPolicy: IfNotPresent prometheus: repository: quay.io/prometheus/prometheus tag: "v2.43.0"