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/25 14:09:43 UTC
[incubator-openwhisk-deploy-kube] branch master updated (395e8ca ->
058f3bd)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git.
from 395e8ca Return to use of full ASF header (#485)
new f1a2ae9 fix indentation in zookeeper readinessProbe
new 058f3bd fix host port format for nc command
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
helm/openwhisk/templates/zookeeper-pod.yaml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
[incubator-openwhisk-deploy-kube] 02/02: fix host port format for
nc command
Posted by dg...@apache.org.
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 058f3bd5564feb14cf465aa5c62c4d07f769588d
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Sun Jun 23 10:34:21 2019 -0700
fix host port format for nc command
---
helm/openwhisk/templates/zookeeper-pod.yaml | 2 +-
helm/openwhisk/values.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 @@ spec:
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 }}
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 @@ docker:
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"
[incubator-openwhisk-deploy-kube] 01/02: fix indentation in
zookeeper readinessProbe
Posted by dg...@apache.org.
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 <gr...@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"