You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/03/09 16:20:16 UTC
[GitHub] rabbah closed pull request #163: update for upstream switch to Pureconfig for DB
rabbah closed pull request #163: update for upstream switch to Pureconfig for DB
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/163
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/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
----------------------------------------------------------------
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