Use upstream script-runner and ansible-runner Docker images (#288)

docker/README.md

@@ -24,9 +24,5 @@ These images are built automatically and published
 to DockerHub under the openwhisk userid.  Docker images are
 published on all successful Travis CI builds of the master branch.
 The built images are:
-  * whisk-ansible-runner - An alpine-based utility image for running
-    ansible playbooks.
-  * whisk-script-runner - An alpine-based utility image for running
-    simple bash scripts that need the `wsk` cli available to them.
   * invoker-agent - worker node invoker agent -- used to implement
     suspend/resume on action containers for a remote invoker

helm/openwhisk-providers/charts/ow-alarm/templates/installPkgAlarmJob.yaml

@@ -19,7 +19,7 @@ spec:
           name: install-package-alarms
       containers:
       - name: alarmpkginstaller
-        image: openwhisk/kube-whisk-script-runner
+        image: openwhisk/script-runner
         volumeMounts:
         - name: task-dir
           mountPath: "/task/myTask.sh"

helm/openwhisk-providers/charts/ow-cloudant/templates/installPkgCloudantJob.yaml

@@ -19,7 +19,7 @@ spec:
           name: install-package-cloudant
       containers:
       - name: cloudantpkginstaller
-        image: openwhisk/kube-whisk-script-runner
+        image: openwhisk/script-runner
         volumeMounts:
         - name: task-dir
           mountPath: "/task/myTask.sh"

helm/openwhisk-providers/charts/ow-kafka/templates/installPkgKafkaJob.yaml

@@ -19,7 +19,7 @@ spec:
           name: install-package-kafka
       containers:
       - name: kafkapkginstaller
-        image: openwhisk/kube-whisk-script-runner
+        image: openwhisk/script-runner
         volumeMounts:
         - name: task-dir
           mountPath: "/task/myTask.sh"

helm/openwhisk/templates/initCouchDBJob.yaml

@@ -24,7 +24,7 @@ spec:
           secretName: whisk.auth
       containers:
       - name: init-couchdb
-        image: openwhisk/kube-whisk-ansible-runner
+        image: openwhisk/ansible-runner
         imagePullPolicy: "Always"
         command: ["/bin/bash", "-c", "set -e; . /task/initdb.sh"]
         volumeMounts:

helm/openwhisk/templates/installCatalogJob.yaml

@@ -22,7 +22,7 @@ spec:
 {{ include "readiness.waitForController" . | indent 6 }}
       containers:
       - name: catalog
-        image: openwhisk/kube-whisk-script-runner
+        image: openwhisk/script-runner
         volumeMounts:
         - name: task-dir
           mountPath: "/task/myTask.sh"

helm/openwhisk/templates/installRouteMgmtJob.yaml

@@ -22,7 +22,7 @@ spec:
 {{ include "readiness.waitForController" . | indent 6 }}
       containers:
       - name: routemgmt
-        image: openwhisk/kube-whisk-script-runner
+        image: openwhisk/script-runner
         volumeMounts:
         - name: task-dir
           mountPath: "/task/myTask.sh"

helm/openwhisk/templates/rolebindings.yaml

@@ -38,12 +38,12 @@ metadata:
   name: {{ .Values.invoker.name | quote }}
 ---
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Release.Namespace | quote }}
   name: {{ .Values.invoker.name | quote }}
 rules:
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources: ["deployments"]
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 - apiGroups: [""]
@@ -54,7 +54,7 @@ rules:
   verbs: ["get", "list"]
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Release.Namespace | quote }}
   name: {{ .Values.invoker.name | quote }}

helm/openwhisk/values.yaml

@@ -157,7 +157,7 @@ invoker:
   imagePullPolicy: "Always"
   restartPolicy: "Always"
   port: 8080
-  pullRuntimesImage: "openwhisk/kube-whisk-ansible-runner:latest"
+  pullRuntimesImage: "openwhisk/ansible-runner:latest"
   options: ""
   jvmHeapMB: "512"
   jvmOptions: ""

tools/travis/build-helm.sh

@@ -29,7 +29,7 @@ deploymentHealthCheck () {
     sleep 10
   done
 
-  if [ "$PASSED" = false ]; then
+  if [ ! $PASSED ]; then
     echo "Failed to finish deploying $1"
 
     kubectl -n openwhisk logs $(kubectl -n openwhisk get pods -l name="$1" -o wide | grep "$1" | awk '{print $1}')
@@ -62,7 +62,7 @@ statefulsetHealthCheck () {
     sleep 10
   done
 
-  if [ "$PASSED" = false ]; then
+  if [ ! $PASSED ]; then
     echo "Failed to finish deploying $1"
 
     kubectl -n openwhisk logs $(kubectl -n openwhisk get pods -o wide | grep "$1"-0 | awk '{print $1}')
@@ -95,7 +95,7 @@ jobHealthCheck () {
     sleep 10
   done
 
-  if [ "$PASSED" = false ]; then
+  if [ ! $PASSED ]; then
     echo "Failed to finish running $1"
 
     kubectl -n openwhisk logs jobs/$1
@@ -123,7 +123,7 @@ verifyHealthyInvoker () {
     sleep 10
   done
 
-  if [ "$PASSED" = false ]; then
+  if [ ! $PASSED ]; then
     echo "No healthy invokers available"
 
     exit 1

tools/travis/deploy.sh

@@ -9,11 +9,5 @@ ROOTDIR="$SCRIPTDIR/../../"
 
 cd $ROOTDIR
 
-echo "Publishing kube-whisk-script-runner image"
-./tools/travis/publish.sh openwhisk kube-whisk-script-runner latest docker/whisk-script-runner
-
-echo "Publishing kube-whisk-ansible-runner image"
-./tools/travis/publish.sh openwhisk kube-whisk-ansible-runner latest docker/whisk-ansible-runner
-
 echo "Publishing kube-invoker-agent image"
 ./tools/travis/publish.sh openwhisk kube-invoker-agent latest docker/invoker-agent