dgrove-oss closed pull request #271: Correctly writing custom OpenWhisk authentication keys (for the guest… URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/271
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/helm/openwhisk/configMapFiles/initCouchDB/initdb.sh b/helm/openwhisk/configMapFiles/initCouchDB/initdb.sh index 976d6b0..e6c6b4c 100755 --- a/helm/openwhisk/configMapFiles/initCouchDB/initdb.sh +++ b/helm/openwhisk/configMapFiles/initCouchDB/initdb.sh @@ -4,6 +4,10 @@ # Clone OpenWhisk to get the ansible playbooks needed to initialize CouchDB git clone https://github.com/apache/incubator-openwhisk /openwhisk +# overwriting auth.guest and auth.whisk.system files with custom defined keys +echo "$WHISK_AUTH_GUEST" > /openwhisk/ansible/files/auth.guest +echo "$WHISK_AUTH_SYSTEM" > /openwhisk/ansible/files/auth.whisk.system + # generate db_local.ini so the ansible jobs know how to access the database pushd /openwhisk/ansible ansible-playbook -i environments/local setup.yml diff --git a/helm/openwhisk/templates/initCouchDBJob.yaml b/helm/openwhisk/templates/initCouchDBJob.yaml index dc7506c..f192a8f 100644 --- a/helm/openwhisk/templates/initCouchDBJob.yaml +++ b/helm/openwhisk/templates/initCouchDBJob.yaml @@ -61,6 +61,16 @@ spec: key: db_password - name: "NODENAME" value: "couchdb0" + - name: "WHISK_AUTH_GUEST" + valueFrom: + secretKeyRef: + name: whisk.auth + key: guest + - name: "WHISK_AUTH_SYSTEM" + valueFrom: + secretKeyRef: + name: whisk.auth + key: system --- apiVersion: v1 ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services
