[GitHub] rabbah closed pull request #72: Fix travis builds by combining PR70 and PR71

[GitBox <gi...@apache.org>]

rabbah closed pull request #72: Fix travis builds by combining PR70 and PR71
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/72
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/kubernetes/couchdb/couchdb.yml b/kubernetes/couchdb/couchdb.yml
index f390da1..8696934 100644
--- a/kubernetes/couchdb/couchdb.yml
+++ b/kubernetes/couchdb/couchdb.yml
@@ -32,7 +32,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: couchdb
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         image: dgrove/whisk_couchdb
         command: ["/init.sh"]
         ports:
diff --git a/kubernetes/couchdb/docker/Dockerfile b/kubernetes/couchdb/docker/Dockerfile
index ea7dead..5616b38 100644
--- a/kubernetes/couchdb/docker/Dockerfile
+++ b/kubernetes/couchdb/docker/Dockerfile
@@ -10,9 +10,18 @@ RUN apt-get -y update && apt-get -y install \
   curl \
   sudo \
   python-dev \
+  python-pip \
   libffi-dev \
   libssl-dev
 
+RUN pip install --upgrade setuptools
+RUN pip install argcomplete
+RUN pip install couchdb
+RUN pip install --upgrade cffi
+RUN pip install markupsafe
+RUN pip install ansible==2.3.0.0
+RUN pip install -U pyopenssl
+
 COPY init.sh /init.sh
 RUN chmod +X /init.sh
 
diff --git a/kubernetes/couchdb/docker/init.sh b/kubernetes/couchdb/docker/init.sh
index 01d6ba3..f776bca 100755
--- a/kubernetes/couchdb/docker/init.sh
+++ b/kubernetes/couchdb/docker/init.sh
@@ -5,15 +5,6 @@ set -ex
 git clone https://github.com/apache/incubator-openwhisk /openwhisk
 
 pushd /openwhisk
-  # Install ansible requirements
-  ./tools/ubuntu-setup/pip.sh
-
-  # upgrade cffi for ansible error on Debian Jesse
-  pip install --upgrade cffi
-  sudo pip install markupsafe
-  sudo pip install ansible==2.3.0.0
-
-
   # if auth guest overwrite file
   if [ -n "$AUTH_GUEST" ]; then
     echo "$AUTH_GUEST" > /openwhisk/ansible/files/auth.guest
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index 70d95c6..b576297 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -55,6 +55,8 @@ spec:
             value: "latest"
           - name: "INVOKER_CONTAINER_NETWORK"
             value: "bridge"
+          - name: "INVOKER_USE_RUNC"
+            value: "false"
 
           # Properties for invoker image
           - name: "DOCKER_IMAGE_PREFIX"
@@ -68,6 +70,12 @@ spec:
           - name: "INVOKER_INSTANCES"
             value: "1"
 
+          # Invoker assigned name. Derived from hostname
+          - name: "INVOKER_NAME"
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+
           # Java options
           - name: "JAVA_OPTS"
             value: "-Xmx2g"
@@ -82,6 +90,12 @@ spec:
           - name: "KAFKA_HOST_PORT"
             value: "9092"
 
+          # Redis properties
+          - name: "REDIS_HOST"
+            value: "redis.openwhisk"
+          - name: "REDIS_HOST_PORT"
+            value: "6379"
+
           # This property can change since it is generated via Ansible GroupVars
           - name: "RUNTIMES_MANIFEST"
             value: '{ "defaultImagePrefix": "openwhisk", "defaultImageTag": "latest", "runtimes": { "nodejs": [ { "kind": "nodejs", "image": { "name": "nodejsaction" }, "deprecated": true }, { "kind": "nodejs:6", "default": true, "image": { "name": "nodejs6action" }, "deprecated": false } ], "python": [ { "kind": "python", "image": { "name": "python2action" }, "deprecated": false }, { "kind": "python:2", "default": true, "image": { "name": "python2action" }, "deprecated": false }, { "kind": "python:3", "image": { "name": "python3action" }, "deprecated": false } ], "swift": [ { "kind": "swift", "image": { "name": "swiftaction" }, "deprecated": true }, { "kind": "swift:3", "image": { "name": "swift3action" }, "deprecated": false }, { "kind": "swift:3.1.1", "default": true, "image": { "name": "action-swift-v3.1.1" }, "deprecated": false } ], "java": [ { "kind": "java", "default": true, "image": { "name": "java8action" }, "deprecated": false, "attached": { "attachmentName": "jarfile", "
 attachmentType": "application/java-archive" }, "sentinelledLogs": false, "requireMain": true } ] }, "blackboxes": [ { "name": "dockerskeleton" } ] }'


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services