Make erlangCookie and cookieAuthSecret specifiable in extraSecret (#195)

Make erlangCookie and cookieAuthSecret specifyable in extraSecret

Author: JustScreaMy

couchdb/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: couchdb
-version: 4.6.1
+version: 4.6.2
 appVersion: 3.5.0
 description: A database featuring seamless multi-master sync, that scales from
   big data to mobile, with an intuitive HTTP/JSON API and designed for

couchdb/NEWS.md

@@ -1,5 +1,8 @@
 # NEWS
 
+## 4.6.2
+- Added options to specify `erlangCookie` and `cookieAuthSecret` within the extra secret
+
 ## 4.6.1
 - Update default CouchDB version to 3.5.0
 

couchdb/README.md

@@ -1,6 +1,6 @@
 # CouchDB
 
-![Version: 4.6.1](https://img.shields.io/badge/Version-4.6.1-informational?style=flat-square) ![AppVersion: 3.5.0](https://img.shields.io/badge/AppVersion-3.5.0-informational?style=flat-square)
+![Version: 4.6.2](https://img.shields.io/badge/Version-4.6.2-informational?style=flat-square) ![AppVersion: 3.5.0](https://img.shields.io/badge/AppVersion-3.5.0-informational?style=flat-square)
 
 Apache CouchDB is a database featuring seamless multi-master sync, that scales
 from big data to mobile, with an intuitive HTTP/JSON API and designed for
@@ -18,7 +18,7 @@ storage volumes to each Pod in the Deployment.
 ```bash
 $ helm repo add couchdb https://apache.github.io/couchdb-helm
 $ helm install couchdb/couchdb \
-  --version=4.6.1 \
+  --version=4.6.2 \
   --set allowAdminParty=true \
   --set couchdbConfig.couchdb.uuid=$(curl https://www.uuidgenerator.net/api/version4 2>/dev/null | tr -d -)
 ```
@@ -44,7 +44,7 @@ Afterwards install the chart replacing the UUID
 ```bash
 $ helm install \
   --name my-release \
-  --version=4.6.1 \
+  --version=4.6.2 \
   --set couchdbConfig.couchdb.uuid=decafbaddecafbaddecafbaddecafbad \
   couchdb/couchdb
 ```
@@ -78,7 +78,7 @@ and then install the chart while overriding the `createAdminSecret` setting:
 ```bash
 $ helm install \
   --name my-release \
-  --version=4.6.1 \
+  --version=4.6.2 \
   --set createAdminSecret=false \
   --set couchdbConfig.couchdb.uuid=decafbaddecafbaddecafbaddecafbad \
   couchdb/couchdb
@@ -133,7 +133,7 @@ version semantics. You can upgrade directly from `stable/couchdb` to this chart
 
 ```bash
 $ helm repo add couchdb https://apache.github.io/couchdb-helm
-$ helm upgrade my-release --version=4.6.1 couchdb/couchdb
+$ helm upgrade my-release --version=4.6.2 couchdb/couchdb
 ```
 
 ## Configuration
@@ -173,6 +173,8 @@ A variety of other parameters are also configurable. See the comments in the
 | `extraSecretName`                    | "" (the name of a secret resource to provide e.g. admin credentials from an ExternalSecret/vault/etc.)     |
 | `adminUsernameKey`                   | "" (the string/key to access the admin username secret from an extra secret if different from "adminUsername"  |
 | `adminPasswordKey`                   | "" (the string/key to access the admin password secret from an extra secret if different from "adminPassword"  |
+| `cookieAuthSecretKey`                | "" (the string/key to access the cookie auth secret from an extra secret if different from "cookieAuthSecret"  |
+| `erlangCookieKey`                    | "" (the string/key to access the erlang cookie secret from an extra secret if different from "erlangCookie"  |
 | `cookieAuthSecret`                   | auto-generated                                   |
 | `extraPorts`                         | [] (a list of ContainerPort objects)             |
 | `image.repository`                   | couchdb                                          |

couchdb/templates/statefulset.yaml

@@ -125,14 +125,14 @@ spec:
             - name: COUCHDB_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "couchdb.fullname" . }}
-                  key: cookieAuthSecret
+                  name: {{ .Values.extraSecretName | default (include "couchdb.fullname" .) }}
+                  key: {{ .Values.cookieAuthSecretKey | default "cookieAuthSecret" }}
 {{- end }}
             - name: COUCHDB_ERLANG_COOKIE
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "couchdb.fullname" . }}
-                  key: erlangCookie
+                  name: {{ .Values.extraSecretName | default (include "couchdb.fullname" .) }}
+                  key: {{ .Values.erlangCookieKey | default "erlangCookie" }}
             - name: ERL_FLAGS
               value: "{{ range $k, $v := .Values.erlangFlags }} -{{ $k }} {{ $v }} {{ end }}"
 {{- if .Values.extraEnv }}

couchdb/values.yaml

@@ -40,6 +40,8 @@ createAdminSecret: true
 extraSecretName: ""
 adminUsernameKey: ""
 adminPasswordKey: ""
+cookieAuthSecretKey: ""
+erlangCookieKey: ""
 
 adminUsername: admin
 # adminPassword: this_is_not_secure