This is an automated email from the ASF dual-hosted git repository.
daisyguo 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 562565c (1) get utility image names from values.yaml; (2) change
imagePullPolicy to Always for all images with latest tag (#292)
562565c is described below
commit 562565c2b475ad1b0f8373abd7fab53b2f9b9270
Author: David Grove <[email protected]>
AuthorDate: Mon Sep 3 01:44:26 2018 -0400
(1) get utility image names from values.yaml; (2) change imagePullPolicy to
Always for all images with latest tag (#292)
---
.../charts/ow-alarm/templates/installPkgAlarmJob.yaml | 3 ++-
helm/openwhisk-providers/charts/ow-alarm/values.yaml | 7 ++++++-
.../charts/ow-cloudant/templates/installPkgCloudantJob.yaml | 3 ++-
helm/openwhisk-providers/charts/ow-cloudant/values.yaml | 9 +++++++--
.../charts/ow-kafka/templates/installPkgKafkaJob.yaml | 3 ++-
helm/openwhisk-providers/charts/ow-kafka/values.yaml | 5 +++++
helm/openwhisk/templates/initCouchDBJob.yaml | 4 ++--
helm/openwhisk/templates/installCatalogJob.yaml | 3 ++-
helm/openwhisk/templates/installRouteMgmtJob.yaml | 3 ++-
helm/openwhisk/values.yaml | 6 ++++++
10 files changed, 36 insertions(+), 10 deletions(-)
diff --git
a/helm/openwhisk-providers/charts/ow-alarm/templates/installPkgAlarmJob.yaml
b/helm/openwhisk-providers/charts/ow-alarm/templates/installPkgAlarmJob.yaml
index 5430e83..e60f47f 100644
--- a/helm/openwhisk-providers/charts/ow-alarm/templates/installPkgAlarmJob.yaml
+++ b/helm/openwhisk-providers/charts/ow-alarm/templates/installPkgAlarmJob.yaml
@@ -19,7 +19,8 @@ spec:
name: install-package-alarms
containers:
- name: alarmpkginstaller
- image: openwhisk/script-runner
+ image: {{ .Values.utility.scriptRunnerImage | quote }}
+ imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
volumeMounts:
- name: task-dir
mountPath: "/task/myTask.sh"
diff --git a/helm/openwhisk-providers/charts/ow-alarm/values.yaml
b/helm/openwhisk-providers/charts/ow-alarm/values.yaml
index 530c3de..de91652 100644
--- a/helm/openwhisk-providers/charts/ow-alarm/values.yaml
+++ b/helm/openwhisk-providers/charts/ow-alarm/values.yaml
@@ -7,7 +7,7 @@ alarmprovider:
image: "openwhisk/alarmprovider:latest"
# NOTE: replicaCount > 1 doesn't work because of the PVC
replicaCount: 1
- imagePullPolicy: "IfNotPresent"
+ imagePullPolicy: "Always"
restartPolicy: "Always"
apiPort: 8080
dbPrefix: "alm"
@@ -16,3 +16,8 @@ alarmprovider:
size: 1Gi
storageClass: default
accessMode: ReadWriteOnce
+
+# Images used to run auxillary tasks/jobs
+utility:
+ scriptRunnerImage: "openwhisk/script-runner:latest"
+ imagePullPolicy: "Always"
diff --git
a/helm/openwhisk-providers/charts/ow-cloudant/templates/installPkgCloudantJob.yaml
b/helm/openwhisk-providers/charts/ow-cloudant/templates/installPkgCloudantJob.yaml
index d2d661f..439a1a5 100644
---
a/helm/openwhisk-providers/charts/ow-cloudant/templates/installPkgCloudantJob.yaml
+++
b/helm/openwhisk-providers/charts/ow-cloudant/templates/installPkgCloudantJob.yaml
@@ -19,7 +19,8 @@ spec:
name: install-package-cloudant
containers:
- name: cloudantpkginstaller
- image: openwhisk/script-runner
+ image: {{ .Values.utility.scriptRunnerImage | quote }}
+ imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
volumeMounts:
- name: task-dir
mountPath: "/task/myTask.sh"
diff --git a/helm/openwhisk-providers/charts/ow-cloudant/values.yaml
b/helm/openwhisk-providers/charts/ow-cloudant/values.yaml
index 35f7a1f..c3238cb 100644
--- a/helm/openwhisk-providers/charts/ow-cloudant/values.yaml
+++ b/helm/openwhisk-providers/charts/ow-cloudant/values.yaml
@@ -7,7 +7,7 @@ cloudantprovider:
image: "openwhisk/cloudantprovider:latest"
# NOTE: replicaCount > 1 doesn't work because of the PVC
replicaCount: 1
- imagePullPolicy: "IfNotPresent"
+ imagePullPolicy: "Always"
restartPolicy: "Always"
apiPort: 8080
db:
@@ -20,7 +20,12 @@ cloudantprovider:
# username: "admin"
# password: "secret"
persistence:
- pvcName: cludntprovider-pvc
+ pvcName: cloudntprovider-pvc
size: 1Gi
storageClass: default
accessMode: ReadWriteOnce
+
+# Images used to run auxillary tasks/jobs
+utility:
+ scriptRunnerImage: "openwhisk/script-runner:latest"
+ imagePullPolicy: "Always"
diff --git
a/helm/openwhisk-providers/charts/ow-kafka/templates/installPkgKafkaJob.yaml
b/helm/openwhisk-providers/charts/ow-kafka/templates/installPkgKafkaJob.yaml
index 3001bf6..2457fa4 100644
--- a/helm/openwhisk-providers/charts/ow-kafka/templates/installPkgKafkaJob.yaml
+++ b/helm/openwhisk-providers/charts/ow-kafka/templates/installPkgKafkaJob.yaml
@@ -19,7 +19,8 @@ spec:
name: install-package-kafka
containers:
- name: kafkapkginstaller
- image: openwhisk/script-runner
+ image: {{ .Values.utility.scriptRunnerImage | quote }}
+ imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
volumeMounts:
- name: task-dir
mountPath: "/task/myTask.sh"
diff --git a/helm/openwhisk-providers/charts/ow-kafka/values.yaml
b/helm/openwhisk-providers/charts/ow-kafka/values.yaml
index 9b0badc..aa66ab6 100644
--- a/helm/openwhisk-providers/charts/ow-kafka/values.yaml
+++ b/helm/openwhisk-providers/charts/ow-kafka/values.yaml
@@ -11,3 +11,8 @@ kafkaprovider:
restartPolicy: "Always"
apiPort: 8080
dbPrefix: "kp"
+
+# Images used to run auxillary tasks/jobs
+utility:
+ scriptRunnerImage: "openwhisk/script-runner:latest"
+ imagePullPolicy: "Always"
diff --git a/helm/openwhisk/templates/initCouchDBJob.yaml
b/helm/openwhisk/templates/initCouchDBJob.yaml
index e13da6d..8414bca 100644
--- a/helm/openwhisk/templates/initCouchDBJob.yaml
+++ b/helm/openwhisk/templates/initCouchDBJob.yaml
@@ -24,8 +24,8 @@ spec:
secretName: whisk.auth
containers:
- name: init-couchdb
- image: openwhisk/ansible-runner
- imagePullPolicy: "Always"
+ image: {{ .Values.utility.ansibleRunnerImage | quote }}
+ imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
command: ["/bin/bash", "-c", "set -e; . /task/initdb.sh"]
volumeMounts:
- name: task-dir
diff --git a/helm/openwhisk/templates/installCatalogJob.yaml
b/helm/openwhisk/templates/installCatalogJob.yaml
index 3857745..6db70db 100644
--- a/helm/openwhisk/templates/installCatalogJob.yaml
+++ b/helm/openwhisk/templates/installCatalogJob.yaml
@@ -22,7 +22,8 @@ spec:
{{ include "readiness.waitForController" . | indent 6 }}
containers:
- name: catalog
- image: openwhisk/script-runner
+ image: {{ .Values.utility.scriptRunnerImage | quote }}
+ imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
volumeMounts:
- name: task-dir
mountPath: "/task/myTask.sh"
diff --git a/helm/openwhisk/templates/installRouteMgmtJob.yaml
b/helm/openwhisk/templates/installRouteMgmtJob.yaml
index 3559718..3bb36e8 100644
--- a/helm/openwhisk/templates/installRouteMgmtJob.yaml
+++ b/helm/openwhisk/templates/installRouteMgmtJob.yaml
@@ -22,7 +22,8 @@ spec:
{{ include "readiness.waitForController" . | indent 6 }}
containers:
- name: routemgmt
- image: openwhisk/script-runner
+ image: {{ .Values.utility.scriptRunnerImage | quote }}
+ imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
volumeMounts:
- name: task-dir
mountPath: "/task/myTask.sh"
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 5bec652..1479d3a 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -39,6 +39,12 @@ whisk:
loadbalancer:
invokerUserMemory: "2048m"
+# Images used to run auxillary tasks/jobs
+utility:
+ ansibleRunnerImage: "openwhisk/ansible-runner:latest"
+ scriptRunnerImage: "openwhisk/script-runner:latest"
+ imagePullPolicy: "Always"
+
# Docker registry
docker:
image:
