You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/06/14 18:03:19 UTC
[incubator-openwhisk-deploy-kube] branch master updated: renable
zookeeper readiness probe; `nc` restored in upstream image (#480)
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
The following commit(s) were added to refs/heads/master by this push:
new 6d4d774 renable zookeeper readiness probe; `nc` restored in upstream image (#480)
6d4d774 is described below
commit 6d4d774b92c8fc1ebc0c614fc6919cd677d88254
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Fri Jun 14 14:03:13 2019 -0400
renable zookeeper readiness probe; `nc` restored in upstream image (#480)
---
helm/openwhisk/templates/zookeeper-pod.yaml | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/helm/openwhisk/templates/zookeeper-pod.yaml b/helm/openwhisk/templates/zookeeper-pod.yaml
index a1f7700..42306e6 100644
--- a/helm/openwhisk/templates/zookeeper-pod.yaml
+++ b/helm/openwhisk/templates/zookeeper-pod.yaml
@@ -77,16 +77,15 @@ spec:
initialDelaySeconds: {{ .Values.probes.zookeeper.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.zookeeper.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.probes.zookeeper.livenessProbe.timeoutSeconds }}
- # Disabled: See issue https://github.com/apache/incubator-openwhisk-deploy-kube/issues/469
- # 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