rabbah closed pull request #273: Use whisk.auth from secrets instead of the default auths in the git repo URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/273
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..181239f 100755 --- a/helm/openwhisk/configMapFiles/initCouchDB/initdb.sh +++ b/helm/openwhisk/configMapFiles/initCouchDB/initdb.sh @@ -4,6 +4,11 @@ # Clone OpenWhisk to get the ansible playbooks needed to initialize CouchDB git clone https://github.com/apache/incubator-openwhisk /openwhisk +# Copy the secrets whisk.auth.guest and whisk.auth.system into the cloned tree +# overwriting the default values we cloned from git +cp -f /etc/whisk-auth/guest /openwhisk/ansible/files/auth.guest +cp -f /etc/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..0856b07 100644 --- a/helm/openwhisk/templates/initCouchDBJob.yaml +++ b/helm/openwhisk/templates/initCouchDBJob.yaml @@ -19,6 +19,9 @@ spec: - name: task-dir configMap: name: init-couchdb + - name: whisk-auth + secret: + secretName: whisk.auth containers: - name: init-couchdb image: openwhisk/kube-whisk-ansible-runner @@ -28,6 +31,8 @@ spec: - name: task-dir mountPath: "/task/initdb.sh" subPath: "initdb.sh" + - name: whisk-auth + mountPath: "/etc/whisk-auth" env: - name: "DB_PROTOCOL" valueFrom: ---------------------------------------------------------------- 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
