This is an automated email from the ASF dual-hosted git repository.
rabbah 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 18abd0b consolidate apigateway and redis to single pod (#119)
18abd0b is described below
commit 18abd0b427c1d298c02d294f0ec3fe63ecd5a462
Author: David Grove <dgrove-...@users.noreply.github.com>
AuthorDate: Wed Dec 13 16:54:06 2017 -0500
consolidate apigateway and redis to single pod (#119)
Redis is only needed by apigateway, so structure the deployment
of apigateway as a single pod container two containers and do
not expose redis outside of the pod.
---
README.md | 1 -
configure/cleanup.sh | 2 --
kubernetes/apigateway/apigateway.yml | 7 +++++--
kubernetes/redis/README.md | 11 ----------
kubernetes/redis/redis.yml | 40 ------------------------------------
tools/travis/build.sh | 8 --------
6 files changed, 5 insertions(+), 64 deletions(-)
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 2a05e03..b711e50 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -112,14 +112,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
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].
