From 6a0f48e5335207a2545fb0a1a05080e24c96833c Mon Sep 17 00:00:00 2001
From: qindongliang <18210507492@126.com>
Date: Tue, 14 Feb 2023 12:53:49 +0800
Subject: [PATCH] [Feature-13354][deploy] Add configurable busybox image in
 values.yaml (#13354) (#13560)

---
 deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl | 8 ++++----
 deploy/kubernetes/dolphinscheduler/values.yaml            | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
index dd23b8d184..3991a198d9 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
@@ -182,8 +182,8 @@ Wait for database to be ready.
 */}}
 {{- define "dolphinscheduler.database.wait-for-ready" -}}
 - name: wait-for-database
-  image: busybox:1.30
-  imagePullPolicy: IfNotPresent
+  image: {{ .Values.initImage.busybox }}
+  imagePullPolicy: {{ .Values.initImage.pullPolicy }}
 {{- if .Values.postgresql.enabled }}
   command: ['sh', '-xc', 'for i in $(seq 1 180); do nc -z -w3 {{ template "dolphinscheduler.postgresql.fullname" . }} 5432 && exit 0 || sleep 5; done; exit 1']
 {{- else if .Values.mysql.enabled }}
@@ -199,8 +199,8 @@ Wait for minio to be ready.
 {{- define "dolphinscheduler.minio.wait-for-ready" -}}
 {{- if .Values.minio.enabled }}
 - name: wait-for-minio
-  image: busybox:1.30
-  imagePullPolicy: IfNotPresent
+  image: {{ .Values.initImage.busybox }}
+  imagePullPolicy: {{ .Values.initImage.pullPolicy }}
   command: ['sh', '-xc', 'for i in $(seq 1 180); do nc -z -w3 {{ template "dolphinscheduler.minio.fullname" . }} 9000 && exit 0 || sleep 5; done; exit 1']
 {{- end }}
 {{- end -}}
diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml
index 6ce0e378fc..329511a226 100644
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -21,6 +21,11 @@
 
 timezone: "Asia/Shanghai"
 
+# Used to detect whether dolphinscheduler dependent services such as database are ready
+initImage:
+  pullPolicy: "IfNotPresent"
+  busybox: "busybox:1.30.1"
+
 image:
   registry: "dolphinscheduler.docker.scarf.sh/apache"
   tag: "dev-SNAPSHOT"