You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ji...@apache.org on 2020/07/31 01:31:12 UTC
[openwhisk-deploy-kube] branch master updated: Make nginx pod
starts after controller pod (#624)
This is an automated email from the ASF dual-hosted git repository.
jiangpengcheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new 59285fe Make nginx pod starts after controller pod (#624)
59285fe is described below
commit 59285fe3c9f733ef48ed98fa971bbbcd6db7eab6
Author: ningyougang <41...@qq.com>
AuthorDate: Fri Jul 31 09:31:02 2020 +0800
Make nginx pod starts after controller pod (#624)
Co-authored-by: ning.yougang <ni...@navercorp.com>
---
helm/openwhisk/templates/nginx-pod.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/helm/openwhisk/templates/nginx-pod.yaml b/helm/openwhisk/templates/nginx-pod.yaml
index 4a83011..ffdf0b1 100644
--- a/helm/openwhisk/templates/nginx-pod.yaml
+++ b/helm/openwhisk/templates/nginx-pod.yaml
@@ -63,6 +63,9 @@ spec:
- name: logs
emptyDir: {}
{{ include "openwhisk.docker.imagePullSecrets" . | indent 6 }}
+ initContainers:
+ # Wait for a controller to be up (which implies kafka, zookeeper, couchdb are all up as well).
+{{ include "openwhisk.readiness.waitForController" . | indent 6 }}
containers:
- name: nginx
image: "{{- .Values.docker.registry.name -}}{{- .Values.nginx.imageName -}}:{{- .Values.nginx.imageTag -}}"