This is an automated email from the ASF dual-hosted git repository.
csantanapr 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 da7722b service discovery via service ennvars (#102)
da7722b is described below
commit da7722b28bab35ed83df4bf873e9dd93a4580969
Author: David Grove <[email protected]>
AuthorDate: Fri Dec 1 10:53:18 2017 -0500
service discovery via service ennvars (#102)
find services via service environment variables
instead of relying on kube-dns.
---
kubernetes/apigateway/apigateway.yml | 4 ++--
kubernetes/controller/controller.yml | 8 ++++----
kubernetes/invoker/invoker.yml | 10 +++++-----
kubernetes/kafka/kafka.yml | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/kubernetes/apigateway/apigateway.yml
b/kubernetes/apigateway/apigateway.yml
index b69c67c..0ef567b 100644
--- a/kubernetes/apigateway/apigateway.yml
+++ b/kubernetes/apigateway/apigateway.yml
@@ -45,6 +45,6 @@ spec:
containerPort: 9000
env:
- name: "REDIS_HOST"
- value: "redis.openwhisk"
+ value: "$(REDIS_SERVICE_HOST)"
- name: "REDIS_PORT"
- value: "6379"
+ value: "$(REDIS_SERVICE_PORT_REDIS)"
diff --git a/kubernetes/controller/controller.yml
b/kubernetes/controller/controller.yml
index b70e447..470a8b0 100644
--- a/kubernetes/controller/controller.yml
+++ b/kubernetes/controller/controller.yml
@@ -69,7 +69,7 @@ spec:
# Kafka properties
- name: "KAFKA_HOSTS"
- value: "kafka.openwhisk:9092"
+ value: "$(KAFKA_SERVICE_HOST):$(KAFKA_SERVICE_PORT_KAFKA)"
# specific controller arguments
- name: "CONTROLLER_INSTANCES"
@@ -110,12 +110,12 @@ spec:
value: "whisk_admin"
- name: "DB_PASSWORD"
value: "some_passw0rd"
- - name: "DB_PORT"
- value: "5984"
- name: "DB_PROTOCOL"
value: "http"
- name: "DB_HOST"
- value: "couchdb.openwhisk"
+ value: "$(COUCHDB_SERVICE_HOST)"
+ - name: "DB_PORT"
+ value: "$(COUCHDB_SERVICE_PORT_COUCHDB)"
- name: "DB_PROVIDER"
value: "CouchDB"
- name: "DB_WHISK_ACTIONS_DDOC"
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index c18fa16..11be55d 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -86,11 +86,11 @@ spec:
# Kafka properties
- name: "KAFKA_HOSTS"
- value: "kafka.openwhisk:9092"
+ value: "$(KAFKA_SERVICE_HOST):$(KAFKA_SERVICE_PORT_KAFKA)"
# zookeeper info
- name: "ZOOKEEPER_HOSTS"
- value: "zookeeper.openwhisk:2181"
+ value:
"$(ZOOKEEPER_SERVICE_HOST):$(ZOOKEEPER_SERVICE_PORT_ZOOKEEPER)"
# This property can change since it is generated via Ansible
GroupVars
- name: "RUNTIMES_MANIFEST"
@@ -109,12 +109,12 @@ spec:
value: "whisk_admin"
- name: "DB_PASSWORD"
value: "some_passw0rd"
- - name: "DB_PORT"
- value: "5984"
- name: "DB_PROTOCOL"
value: "http"
- name: "DB_HOST"
- value: "couchdb.openwhisk"
+ value: "$(COUCHDB_SERVICE_HOST)"
+ - name: "DB_PORT"
+ value: "$(COUCHDB_SERVICE_PORT_COUCHDB)"
- name: "DB_PROVIDER"
value: "CouchDB"
- name: "DB_WHISK_ACTIONS_DDOC"
diff --git a/kubernetes/kafka/kafka.yml b/kubernetes/kafka/kafka.yml
index e7b4ff8..eea4a0d 100644
--- a/kubernetes/kafka/kafka.yml
+++ b/kubernetes/kafka/kafka.yml
@@ -61,6 +61,6 @@ spec:
# zookeeper info
- name: "ZOOKEEPER_HOST"
- value: "zookeeper.openwhisk"
+ value: "$(ZOOKEEPER_SERVICE_HOST)"
- name: "ZOOKEEPER_PORT"
- value: "2181"
+ value: "$(ZOOKEEPER_SERVICE_PORT_ZOOKEEPER)"
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
