openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgr...@apache.org
Subject [incubator-openwhisk-deploy-kube] 01/02: fix indentation in zookeeper readinessProbe
Date Tue, 25 Jun 2019 14:09:44 GMT
This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git

commit f1a2ae9a57cf412037e2e1bd0ff5805c8e3dc5fc
Author: David Grove <groved@us.ibm.com>
AuthorDate: Tue Jun 18 10:31:03 2019 -0400

    fix indentation in zookeeper readinessProbe
---
 helm/openwhisk/templates/zookeeper-pod.yaml | 18 +++++++++---------
 helm/openwhisk/values.yaml                  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/helm/openwhisk/templates/zookeeper-pod.yaml b/helm/openwhisk/templates/zookeeper-pod.yaml
index 42306e6..21e1b2a 100644
--- a/helm/openwhisk/templates/zookeeper-pod.yaml
+++ b/helm/openwhisk/templates/zookeeper-pod.yaml
@@ -77,15 +77,15 @@ spec:
           initialDelaySeconds: {{ .Values.probes.zookeeper.livenessProbe.initialDelaySeconds
}}
           periodSeconds: {{ .Values.probes.zookeeper.livenessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.probes.zookeeper.livenessProbe.timeoutSeconds }}
-          readinessProbe:
-            exec:
-              command:
-              - /bin/bash
-              - -c
-              - "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 }}
+        readinessProbe:
+          exec:
+            command:
+            - /bin/bash
+            - -c
+            - "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 }}
         volumeMounts:
         - mountPath: /conf
           name: zk-config
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 3349f70..9e974a4 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -165,7 +165,7 @@ docker:
 zookeeper:
   imageName: "zookeeper"
   imageTag: "3.4"
-  imagePullPolicy: "IfNotPresent"
+  imagePullPolicy: "Always"  # Workaround caching of 3.4.x images that don't have nc
   # Note: Zookeeper's quorum protocol is designed to have an odd number of replicas.
   replicaCount: 1
   restartPolicy: "Always"


Mime
View raw message