[GitHub] rabbah closed pull request #119: consolidate apigateway and redis to single pod

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

rabbah closed pull request #119: consolidate apigateway and redis to single pod
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/119
 
 
   

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/README.md b/README.md
index 56323fa..bd1fd8c 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,6 @@ the instructions for each step in order.
       within the Kubernetes cluster.
     * For a production level CouchDB instance, take a look at the main
       OpenWhisk [documentation for configuring CouchDB](https://github.com/apache/incubator-openwhisk/blob/master/tools/db/README.md).
-* Deploy [Redis](kubernetes/redis/README.md)
 * Deploy [ApiGateway](kubernetes/apigateway/README.md)
 * Deploy [Zookeeper](kubernetes/zookeeper/README.md)
 * Deploy [Kafka](kubernetes/kafka/README.md)
diff --git a/configure/cleanup.sh b/configure/cleanup.sh
index 9116e61..48956b6 100755
--- a/configure/cleanup.sh
+++ b/configure/cleanup.sh
@@ -6,7 +6,6 @@ set -x
 
 # delete deployments
 kubectl -n openwhisk delete deployment couchdb
-kubectl -n openwhisk delete deployment redis
 kubectl -n openwhisk delete deployment apigateway
 kubectl -n openwhisk delete deployment zookeeper
 kubectl -n openwhisk delete deployment kafka
@@ -25,7 +24,6 @@ kubectl -n openwhisk delete ingress ow-ingress
 
 # delete services
 kubectl -n openwhisk delete service couchdb
-kubectl -n openwhisk delete service redis
 kubectl -n openwhisk delete service apigateway
 kubectl -n openwhisk delete service zookeeper
 kubectl -n openwhisk delete service kafka
diff --git a/kubernetes/apigateway/apigateway.yml b/kubernetes/apigateway/apigateway.yml
index 0ef567b..6d1fa3c 100644
--- a/kubernetes/apigateway/apigateway.yml
+++ b/kubernetes/apigateway/apigateway.yml
@@ -35,6 +35,9 @@ spec:
       restartPolicy: Always
 
       containers:
+      - name: redis
+        imagePullPolicy: IfNotPresent
+        image: redis:3.2
       - name: apigateway
         imagePullPolicy: IfNotPresent
         image: openwhisk/apigateway
@@ -45,6 +48,6 @@ spec:
           containerPort: 9000
         env:
         - name: "REDIS_HOST"
-          value: "$(REDIS_SERVICE_HOST)"
+          value: "127.0.0.1"
         - name: "REDIS_PORT"
-          value: "$(REDIS_SERVICE_PORT_REDIS)"
+          value: "6379"
diff --git a/kubernetes/redis/README.md b/kubernetes/redis/README.md
deleted file mode 100644
index ede13a8..0000000
--- a/kubernetes/redis/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Redis
------
-
-# Deploying
-
-To deploy Redis, you will just need to deploy the public redis docker
-container and a service.
-
-```
-kubectl apply -f redis.yml
-```
diff --git a/kubernetes/redis/redis.yml b/kubernetes/redis/redis.yml
deleted file mode 100644
index 447e6f4..0000000
--- a/kubernetes/redis/redis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  namespace: openwhisk
-  labels:
-    name: redis
-spec:
-  selector:
-    name: redis
-  ports:
-    - port: 6379
-      targetPort: 6379
-      name: redis
-
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: redis
-  namespace: openwhisk
-  labels:
-    name: redis
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        name: redis
-    spec:
-      restartPolicy: Always
-
-      containers:
-      - name: redis
-        imagePullPolicy: IfNotPresent
-        image: redis:3.2
-        ports:
-        - name: redis
-          containerPort: 6379
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 7691097..2a2fa69 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -111,14 +111,6 @@ pushd kubernetes/couchdb
   couchdbHealthCheck
 popd
 
-# setup redis
-echo "Deploying redis"
-pushd kubernetes/redis
-  kubectl apply -f redis.yml
-
-  deploymentHealthCheck "redis"
-popd
-
 # setup apigateway
 echo "Deploying apigateway"
 pushd kubernetes/apigateway


 

----------------------------------------------------------------
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