commit 058f3bd5564feb14cf465aa5c62c4d07f769588d
author David Grove <groved@us.ibm.com> Sun Jun 23 10:34:21 2019 -0700
committer David Grove <dgrove-oss@users.noreply.github.com> Tue Jun 25 07:09:37 2019 -0700
tree 0b6c68c79ef162b8228033d981038b2e39fa1205
parent f1a2ae9a57cf412037e2e1bd0ff5805c8e3dc5fc

fix host port format for nc command

helm/openwhisk/templates/zookeeper-pod.yaml

diff --git a/helm/openwhisk/templates/zookeeper-pod.yaml b/helm/openwhisk/templates/zookeeper-pod.yaml
index 21e1b2a..e673023 100644
--- a/helm/openwhisk/templates/zookeeper-pod.yaml
+++ b/helm/openwhisk/templates/zookeeper-pod.yaml
@@ -82,7 +82,7 @@
             command:
             - /bin/bash
             - -c
-            - "echo ruok | nc -w 1 localhost:{{ .Values.zookeeper.port }} | grep imok"
+            - "echo ruok | nc -w 1 localhost {{ .Values.zookeeper.port }} | grep imok"
           initialDelaySeconds: {{ .Values.probes.zookeeper.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.probes.zookeeper.readinessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.probes.zookeeper.readinessProbe.timeoutSeconds }}

helm/openwhisk/values.yaml

diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 9e974a4..3349f70 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -165,7 +165,7 @@
 zookeeper:
   imageName: "zookeeper"
   imageTag: "3.4"
-  imagePullPolicy: "Always"  # Workaround caching of 3.4.x images that don't have nc
+  imagePullPolicy: "IfNotPresent"
   # Note: Zookeeper's quorum protocol is designed to have an odd number of replicas.
   replicaCount: 1
   restartPolicy: "Always"