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 2020/11/19 19:48:37 UTC
[openwhisk-deploy-kube] branch 1.0.0 updated (c87079b -> 0e2d41b)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a change to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git.
from c87079b prep for 1.0.0 release by synching image tags with core repo 1.0.0 (#648)
new 14de4f8 Updated to include Windows tools (#650)
new 0e2d41b Make busybox image configurable (#651)
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:
docs/k8s-docker-for-windows.md | 6 +++++-
helm/openwhisk/templates/_readiness.tpl | 12 ++++++------
helm/openwhisk/templates/redis-pod.yaml | 2 +-
helm/openwhisk/values.yaml | 4 ++++
4 files changed, 16 insertions(+), 8 deletions(-)
[openwhisk-deploy-kube] 01/02: Updated to include Windows tools
(#650)
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git
commit 14de4f8e722abeee9a2211cd9412a98b9beb04e2
Author: Erdogan Kurtur <ed...@gmail.com>
AuthorDate: Tue Oct 27 17:03:51 2020 +0300
Updated to include Windows tools (#650)
Instead of `grep` which is not deployed with Windows by default, converted code to use built-in `find` tool.
Also added a step to reduce possible installation issues
---
docs/k8s-docker-for-windows.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/k8s-docker-for-windows.md b/docs/k8s-docker-for-windows.md
index 8fbf06d..d511001 100644
--- a/docs/k8s-docker-for-windows.md
+++ b/docs/k8s-docker-for-windows.md
@@ -60,7 +60,7 @@ the box to enable Kubernetes.
### Configuring OpenWhisk
You will be using a NodePort ingress to access OpenWhisk. Assuming
-`kubectl describe nodes | grep InternalIP` returns 192.168.65.3 and
+`kubectl describe nodes | find "InternalIP"` returns 192.168.65.3 and
port 31001 is available to be used on your host machine, a
mycluster.yaml for a standard deployment of OpenWhisk would be:
@@ -77,6 +77,10 @@ nginx:
### Using helm to install OpenWhisk
+Installation expects `openwhisk` namespace to be created. To create, run
+
+`kubectl create namespace openwhisk`
+
Indicate the Kubernetes worker nodes that should be used to execute user
containers by OpenWhisk's invokers. For a single node development cluster,
simply run:
[openwhisk-deploy-kube] 02/02: Make busybox image configurable
(#651)
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git
commit 0e2d41b5b80ed191e4d7bdf03450ca41f61d29e7
Author: jiangpch <ji...@navercorp.com>
AuthorDate: Thu Nov 12 22:20:41 2020 +0800
Make busybox image configurable (#651)
---
helm/openwhisk/templates/_readiness.tpl | 12 ++++++------
helm/openwhisk/templates/redis-pod.yaml | 2 +-
helm/openwhisk/values.yaml | 4 ++++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/helm/openwhisk/templates/_readiness.tpl b/helm/openwhisk/templates/_readiness.tpl
index b144646..e5bc7d5 100644
--- a/helm/openwhisk/templates/_readiness.tpl
+++ b/helm/openwhisk/templates/_readiness.tpl
@@ -21,7 +21,7 @@
# if not db.wipeAndInit, the external db must already be ready; so no need for init container
{{- else -}}
- name: "wait-for-couchdb"
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
imagePullPolicy: "IfNotPresent"
env:
- name: "READINESS_URL"
@@ -33,7 +33,7 @@
{{/* Init container that waits for kafka to be ready */}}
{{- define "openwhisk.readiness.waitForKafka" -}}
- name: "wait-for-kafka"
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
imagePullPolicy: "IfNotPresent"
# TODO: I haven't found an easy external test to determine that kafka is up, so as a hack we wait for zookeeper and then sleep for 10 seconds and cross our fingers!
command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "openwhisk.zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi done; echo "Zookeeper is up; will wait for 10 seconds to give kafka time to initialize"; sleep 10;']
@@ -42,7 +42,7 @@
{{/* Init container that waits for zookeeper to be ready */}}
{{- define "openwhisk.readiness.waitForZookeeper" -}}
- name: "wait-for-zookeeper"
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
imagePullPolicy: "IfNotPresent"
command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "openwhisk.zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi; done; echo "Success: zookeeper is up"']
{{- end -}}
@@ -50,7 +50,7 @@
{{/* Init container that waits for controller to be ready */}}
{{- define "openwhisk.readiness.waitForController" -}}
- name: "wait-for-controller"
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
imagePullPolicy: "IfNotPresent"
env:
- name: "READINESS_URL"
@@ -61,7 +61,7 @@
{{/* Init container that waits for at least 1 healthy invoker */}}
{{- define "openwhisk.readiness.waitForHealthyInvoker" -}}
- name: "wait-for-healthy-invoker"
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
imagePullPolicy: "IfNotPresent"
env:
- name: "READINESS_URL"
@@ -72,7 +72,7 @@
{{/* Init container that waits for ElasticSearch to be ready */}}
{{- define "openwhisk.readiness.waitForElasticSearch" -}}
- name: "wait-for-elasticsearch"
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
imagePullPolicy: "IfNotPresent"
env:
- name: "READINESS_URL"
diff --git a/helm/openwhisk/templates/redis-pod.yaml b/helm/openwhisk/templates/redis-pod.yaml
index 1bf7160..d5dc44c 100644
--- a/helm/openwhisk/templates/redis-pod.yaml
+++ b/helm/openwhisk/templates/redis-pod.yaml
@@ -57,7 +57,7 @@ spec:
{{- if .Values.k8s.persistence.enabled }}
initContainers:
- name: redis-init
- image: "{{- .Values.docker.registry.name -}}busybox"
+ image: "{{- .Values.docker.registry.name -}}{{- .Values.busybox.imageName -}}:{{- .Values.busybox.imageTag -}}"
command:
- chown
- -v
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 7e7c0f3..fa07862 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -398,6 +398,10 @@ providers:
apiPort: 8080
dbPrefix: "kp"
+busybox:
+ imageName: "busybox"
+ imageTag: "latest"
+
# Used to define pod affinity and anti-affinity for the Kubernetes scheduler.
# If affinity.enabled is true, then all of the deployments for the OpenWhisk