This is an automated email from the ASF dual-hosted git repository. dgrove pushed a commit to branch 1.0.0 in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git
commit 0e2d41b5b80ed191e4d7bdf03450ca41f61d29e7 Author: jiangpch <[email protected]> AuthorDate: Thu Nov 12 22:20:41 2020 +0800 Make busybox image configurable (#651) --- helm/openwhisk/templates/_readiness.tpl | 12 ++++++------ helm/openwhisk/templates/redis-pod.yaml | 2 +- helm/openwhisk/values.yaml | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/helm/openwhisk/templates/_readiness.tpl b/helm/openwhisk/templates/_readiness.tpl index b144646..e5bc7d5 100644 --- a/helm/openwhisk/templates/_readiness.tpl +++ b/helm/openwhisk/templates/_readiness.tpl @@ -21,7 +21,7 @@ # if not db.wipeAndInit, the external db must already be ready; so no need for init container {{- else -}} - name: "wait-for-couchdb" - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" imagePullPolicy: "IfNotPresent" env: - name: "READINESS_URL" @@ -33,7 +33,7 @@ {{/* Init container that waits for kafka to be ready */}} {{- define "openwhisk.readiness.waitForKafka" -}} - name: "wait-for-kafka" - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" imagePullPolicy: "IfNotPresent" # TODO: I haven't found an easy external test to determine that kafka is up, so as a hack we wait for zookeeper and then sleep for 10 seconds and cross our fingers! command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "openwhisk.zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi done; echo "Zookeeper is up; will wait for 10 seconds to give kafka time to initialize"; sleep 10;'] @@ -42,7 +42,7 @@ {{/* Init container that waits for zookeeper to be ready */}} {{- define "openwhisk.readiness.waitForZookeeper" -}} - name: "wait-for-zookeeper" - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" imagePullPolicy: "IfNotPresent" command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "openwhisk.zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi; done; echo "Success: zookeeper is up"'] {{- end -}} @@ -50,7 +50,7 @@ {{/* Init container that waits for controller to be ready */}} {{- define "openwhisk.readiness.waitForController" -}} - name: "wait-for-controller" - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" imagePullPolicy: "IfNotPresent" env: - name: "READINESS_URL" @@ -61,7 +61,7 @@ {{/* Init container that waits for at least 1 healthy invoker */}} {{- define "openwhisk.readiness.waitForHealthyInvoker" -}} - name: "wait-for-healthy-invoker" - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" imagePullPolicy: "IfNotPresent" env: - name: "READINESS_URL" @@ -72,7 +72,7 @@ {{/* Init container that waits for ElasticSearch to be ready */}} {{- define "openwhisk.readiness.waitForElasticSearch" -}} - name: "wait-for-elasticsearch" - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" imagePullPolicy: "IfNotPresent" env: - name: "READINESS_URL" diff --git a/helm/openwhisk/templates/redis-pod.yaml b/helm/openwhisk/templates/redis-pod.yaml index 1bf7160..d5dc44c 100644 --- a/helm/openwhisk/templates/redis-pod.yaml +++ b/helm/openwhisk/templates/redis-pod.yaml @@ -57,7 +57,7 @@ spec: {{- if .Values.k8s.persistence.enabled }} initContainers: - name: redis-init - image: "{{- .Values.docker.registry.name -}}busybox" + image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}" command: - chown - -v diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml index 7e7c0f3..fa07862 100644 --- a/helm/openwhisk/values.yaml +++ b/helm/openwhisk/values.yaml @@ -398,6 +398,10 @@ providers: apiPort: 8080 dbPrefix: "kp" +busybox: + imageName: "busybox" + imageTag: "latest" + # Used to define pod affinity and anti-affinity for the Kubernetes scheduler. # If affinity.enabled is true, then all of the deployments for the OpenWhisk
