Browse Source

[Feature-13354][deploy] Add configurable busybox image in values.yaml (#13354) (#13560)

3.2.0-release
qindongliang 2 years ago committed by GitHub
parent
commit
6a0f48e533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
  2. 5
      deploy/kubernetes/dolphinscheduler/values.yaml

8
deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl

@ -182,8 +182,8 @@ Wait for database to be ready.
*/}} */}}
{{- define "dolphinscheduler.database.wait-for-ready" -}} {{- define "dolphinscheduler.database.wait-for-ready" -}}
- name: wait-for-database - name: wait-for-database
image: busybox:1.30 image: {{ .Values.initImage.busybox }}
imagePullPolicy: IfNotPresent imagePullPolicy: {{ .Values.initImage.pullPolicy }}
{{- if .Values.postgresql.enabled }} {{- 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'] 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 }} {{- else if .Values.mysql.enabled }}
@ -199,8 +199,8 @@ Wait for minio to be ready.
{{- define "dolphinscheduler.minio.wait-for-ready" -}} {{- define "dolphinscheduler.minio.wait-for-ready" -}}
{{- if .Values.minio.enabled }} {{- if .Values.minio.enabled }}
- name: wait-for-minio - name: wait-for-minio
image: busybox:1.30 image: {{ .Values.initImage.busybox }}
imagePullPolicy: IfNotPresent 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'] 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 }}
{{- end -}} {{- end -}}

5
deploy/kubernetes/dolphinscheduler/values.yaml

@ -21,6 +21,11 @@
timezone: "Asia/Shanghai" timezone: "Asia/Shanghai"
# Used to detect whether dolphinscheduler dependent services such as database are ready
initImage:
pullPolicy: "IfNotPresent"
busybox: "busybox:1.30.1"
image: image:
registry: "dolphinscheduler.docker.scarf.sh/apache" registry: "dolphinscheduler.docker.scarf.sh/apache"
tag: "dev-SNAPSHOT" tag: "dev-SNAPSHOT"

Loading…
Cancel
Save