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 e0c4592 update for upstream switch to Pureconfig for DB (#163)
e0c4592 is described below
commit e0c45926eeb1b0053b09e8f5700bb94e18068517
Author: David Grove <[email protected]>
AuthorDate: Fri Mar 9 11:20:15 2018 -0500
update for upstream switch to Pureconfig for DB (#163)
---
kubernetes/controller/controller.yml | 18 +++++++++---------
kubernetes/invoker/invoker.yml | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/kubernetes/controller/controller.yml
b/kubernetes/controller/controller.yml
index 1a4947e..a279442 100644
--- a/kubernetes/controller/controller.yml
+++ b/kubernetes/controller/controller.yml
@@ -140,41 +140,41 @@ spec:
value: "$(KAFKA_SERVICE_HOST):$(KAFKA_SERVICE_PORT_KAFKA)"
# properties for DB connection
- - name: "DB_USERNAME"
+ - name: "CONFIG_whisk_couchdb_username"
valueFrom:
secretKeyRef:
name: db.auth
key: db_username
- - name: "DB_PASSWORD"
+ - name: "CONFIG_whisk_couchdb_password"
valueFrom:
secretKeyRef:
name: db.auth
key: db_password
- - name: "DB_PROTOCOL"
+ - name: "CONFIG_whisk_couchdb_protocol"
valueFrom:
configMapKeyRef:
name: db.config
key: db_protocol
- - name: "DB_HOST"
+ - name: "CONFIG_whisk_couchdb_host"
value: "$(COUCHDB_SERVICE_HOST)"
- - name: "DB_PORT"
+ - name: "CONFIG_whisk_couchdb_port"
value: "$(COUCHDB_SERVICE_PORT_COUCHDB)"
- - name: "DB_PROVIDER"
+ - name: "CONFIG_whisk_couchdb_provider"
valueFrom:
configMapKeyRef:
name: db.config
key: db_provider
- - name: "DB_WHISK_ACTIVATIONS"
+ - name: "CONFIG_whisk_couchdb_databases_WhiskActivation"
valueFrom:
configMapKeyRef:
name: db.config
key: db_whisk_activations
- - name: "DB_WHISK_ACTIONS"
+ - name: "CONFIG_whisk_couchdb_databases_WhiskEntity"
valueFrom:
configMapKeyRef:
name: db.config
key: db_whisk_actions
- - name: "DB_WHISK_AUTHS"
+ - name: "CONFIG_whisk_couchdb_databases_WhiskAuth"
valueFrom:
configMapKeyRef:
name: db.config
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index 6e7031f..58c5dd6 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -161,41 +161,41 @@ spec:
value:
"$(ZOOKEEPER_SERVICE_HOST):$(ZOOKEEPER_SERVICE_PORT_ZOOKEEPER)"
# properties for DB connection
- - name: "DB_USERNAME"
+ - name: "CONFIG_whisk_couchdb_username"
valueFrom:
secretKeyRef:
name: db.auth
key: db_username
- - name: "DB_PASSWORD"
+ - name: "CONFIG_whisk_couchdb_password"
valueFrom:
secretKeyRef:
name: db.auth
key: db_password
- - name: "DB_PROTOCOL"
+ - name: "CONFIG_whisk_couchdb_protocol"
valueFrom:
configMapKeyRef:
name: db.config
key: db_protocol
- - name: "DB_HOST"
+ - name: "CONFIG_whisk_couchdb_host"
value: "$(COUCHDB_SERVICE_HOST)"
- - name: "DB_PORT"
+ - name: "CONFIG_whisk_couchdb_port"
value: "$(COUCHDB_SERVICE_PORT_COUCHDB)"
- - name: "DB_PROVIDER"
+ - name: "CONFIG_whisk_couchdb_provider"
valueFrom:
configMapKeyRef:
name: db.config
key: db_provider
- - name: "DB_WHISK_ACTIVATIONS"
+ - name: "CONFIG_whisk_couchdb_databases_WhiskActivation"
valueFrom:
configMapKeyRef:
name: db.config
key: db_whisk_activations
- - name: "DB_WHISK_ACTIONS"
+ - name: "CONFIG_whisk_couchdb_databases_WhiskEntity"
valueFrom:
configMapKeyRef:
name: db.config
key: db_whisk_actions
- - name: "DB_WHISK_AUTHS"
+ - name: "CONFIG_whisk_couchdb_databases_WhiskAuth"
valueFrom:
configMapKeyRef:
name: db.config
--
To stop receiving notification emails like this one, please contact
[email protected].
