This is an automated email from the ASF dual-hosted git repository. csantanapr 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 98b1927 switch to ow-utils image (#386) 98b1927 is described below commit 98b1927b68afb876af62e67ffb72fb7a2dcd9344 Author: David Grove <dgrove-...@users.noreply.github.com> AuthorDate: Fri Dec 7 12:01:21 2018 -0500 switch to ow-utils image (#386) --- helm/openwhisk/templates/_invoker-helpers.tpl | 5 +++-- helm/openwhisk/templates/couchdb-init-job.yaml | 4 ++-- helm/openwhisk/templates/install-packages-job.yaml | 5 +++-- helm/openwhisk/templates/tests/package-checker-pod.yaml | 5 +++-- helm/openwhisk/templates/tests/smoketest-pod.yaml | 5 +++-- helm/openwhisk/values.yaml | 11 +++-------- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/helm/openwhisk/templates/_invoker-helpers.tpl b/helm/openwhisk/templates/_invoker-helpers.tpl index 38d2a18..11744cd 100644 --- a/helm/openwhisk/templates/_invoker-helpers.tpl +++ b/helm/openwhisk/templates/_invoker-helpers.tpl @@ -33,8 +33,9 @@ {{- define "openwhisk.docker_pull_runtimes" -}} - name: docker-pull-runtimes - imagePullPolicy: {{ .Values.utility.ansibleRunner.imagePullPolicy | quote }} - image: "{{- .Values.utility.ansibleRunner.imageName -}}:{{- .Values.utility.ansibleRunner.imageTag -}}" + imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }} + image: "{{- .Values.utility.imageName -}}:{{- .Values.utility.imageTag -}}" + command: ["/usr/local/bin/ansible-playbook", "/task/playbook.yml"] volumeMounts: - name: dockersock mountPath: "/var/run/docker.sock" diff --git a/helm/openwhisk/templates/couchdb-init-job.yaml b/helm/openwhisk/templates/couchdb-init-job.yaml index b4b3267..b6d6ec1 100644 --- a/helm/openwhisk/templates/couchdb-init-job.yaml +++ b/helm/openwhisk/templates/couchdb-init-job.yaml @@ -28,8 +28,8 @@ spec: secretName: whisk.auth containers: - name: init-couchdb - image: "{{- .Values.utility.ansibleRunner.imageName -}}:{{- .Values.utility.ansibleRunner.imageTag -}}" - imagePullPolicy: {{ .Values.utility.ansibleRunner.imagePullPolicy | quote }} + image: "{{- .Values.utility.imageName -}}:{{- .Values.utility.imageTag -}}" + imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }} command: ["/bin/bash", "-c", "set -e; . /task/initdb.sh"] volumeMounts: - name: task-dir diff --git a/helm/openwhisk/templates/install-packages-job.yaml b/helm/openwhisk/templates/install-packages-job.yaml index c3ee617..31322a2 100644 --- a/helm/openwhisk/templates/install-packages-job.yaml +++ b/helm/openwhisk/templates/install-packages-job.yaml @@ -26,8 +26,9 @@ spec: {{ include "openwhisk.readiness.waitForHealthyInvoker" . | indent 6 }} containers: - name: install-packages - image: "{{- .Values.utility.scriptRunner.imageName -}}:{{- .Values.utility.scriptRunner.imageTag -}}" - imagePullPolicy: {{ .Values.utility.scriptRunner.imagePullPolicy | quote }} + image: "{{- .Values.utility.imageName -}}:{{- .Values.utility.imageTag -}}" + imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }} + command: ["/bin/bash", "-c", "set -e; . /task/myTask.sh"] volumeMounts: - name: task-dir mountPath: "/task/myTask.sh" diff --git a/helm/openwhisk/templates/tests/package-checker-pod.yaml b/helm/openwhisk/templates/tests/package-checker-pod.yaml index 4417b5d..72f0764 100644 --- a/helm/openwhisk/templates/tests/package-checker-pod.yaml +++ b/helm/openwhisk/templates/tests/package-checker-pod.yaml @@ -19,8 +19,9 @@ spec: name: openwhisk-tests-package-checker-cm containers: - name: package-checker - image: "{{- .Values.utility.scriptRunner.imageName -}}:{{- .Values.utility.scriptRunner.imageTag -}}" - imagePullPolicy: {{ .Values.utility.scriptRunner.imagePullPolicy | quote }} + image: "{{- .Values.utility.imageName -}}:{{- .Values.utility.imageTag -}}" + imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }} + command: ["/bin/bash", "-c", "set -e; . /task/myTask.sh"] volumeMounts: - name: task-dir mountPath: "/task/myTask.sh" diff --git a/helm/openwhisk/templates/tests/smoketest-pod.yaml b/helm/openwhisk/templates/tests/smoketest-pod.yaml index 89b78cc..c2780e0 100644 --- a/helm/openwhisk/templates/tests/smoketest-pod.yaml +++ b/helm/openwhisk/templates/tests/smoketest-pod.yaml @@ -19,8 +19,9 @@ spec: name: openwhisk-tests-smoketest-cm containers: - name: smoketest - image: "{{- .Values.utility.scriptRunner.imageName -}}:{{- .Values.utility.scriptRunner.imageTag -}}" - imagePullPolicy: {{ .Values.utility.scriptRunner.imagePullPolicy | quote }} + image: "{{- .Values.utility.imageName -}}:{{- .Values.utility.imageTag -}}" + imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }} + command: ["/bin/bash", "-c", "set -e; . /task/myTask.sh"] volumeMounts: - name: task-dir mountPath: "/task/myTask.sh" diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml index 9d81a09..9a2d8ab 100644 --- a/helm/openwhisk/values.yaml +++ b/helm/openwhisk/values.yaml @@ -86,14 +86,9 @@ k8s: # Images used to run auxillary tasks/jobs utility: - ansibleRunner: - imageName: "openwhisk/ansible-runner" - imageTag: "7bd4971" - imagePullPolicy: "IfNotPresent" - scriptRunner: - imageName: "openwhisk/script-runner" - imageTag: "7bd4971" - imagePullPolicy: "IfNotPresent" + imageName: "openwhisk/ow-utils" + imageTag: "570c044" + imagePullPolicy: "IfNotPresent" # Docker registry docker: