[couchdb-helm] branch lana updated (8cbdb73 -> bf2bfcf)

[fl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

flimzy pushed a change to branch lana
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git.


 discard 8cbdb73  Fix template conditional
 discard 7c81a4c  Set curl credentials for require_valid_user, as well
     new bf2bfcf  Set curl credentials for require_valid_user, as well

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (8cbdb73)
            \
             N -- N -- N   refs/heads/lana (bf2bfcf)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[couchdb-helm] 01/01: Set curl credentials for require_valid_user, as well

[fl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

flimzy pushed a commit to branch lana
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git

commit bf2bfcfbd5bcd61320f37bbad4f6bcb3bb786957
Author: Jonathan Hall <fl...@flimzy.com>
AuthorDate: Mon Sep 21 16:16:50 2020 +0200

    Set curl credentials for require_valid_user, as well
    
    This does mean that we now send credentials for the /_up endpoint even when
    require_valid_user is not set, but this should not hurt anything.
---
 couchdb/templates/clustersetup.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/couchdb/templates/clustersetup.yaml b/couchdb/templates/clustersetup.yaml
index e00ab87..336c653 100644
--- a/couchdb/templates/clustersetup.yaml
+++ b/couchdb/templates/clustersetup.yaml
@@ -15,17 +15,18 @@ data:
     BASE_URL=http://{{ template "couchdb.fullname" . }}:5984
     set -x
 
+    touch /tmp/curl.cf
+    {{ if or .Values.couchdbConfig.chttpd.require_valid_user (not .Values.allowAdminParty) }}
+        echo "-u $(cat /tmp/admin-password/adminUsername):$(cat /tmp/admin-password/adminPassword)" >> /tmp/curl.cf
+    {{ end }}
+
     echo "Waiting for CouchDB service to start..."
-    until curl --silent -max-time 5 --head --fail "${BASE_URL}/_up"; do
+    until curl --silent -max-time 5 --head --fail "${BASE_URL}/_up" -K /tmp/curl.cf; do
         printf "%s: CouchDB not up yet. Will try again\n" "$(date)"
         sleep 2
     done
 
     echo "Initializing cluster"
-    touch /tmp/curl.cf
-    {{ if not .Values.allowAdminParty }}
-        echo "-u $(cat /tmp/admin-password/adminUsername):$(cat /tmp/admin-password/adminPassword)" >> /tmp/curl.cf
-    {{ end }}
     curl -silent "${BASE_URL}/_cluster_setup" \
       -H "Content-Type: application/json" \
       -d '{"action": "finish_cluster"}' \