This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
The following commit(s) were added to refs/heads/main by this push:
new 00e3329 Make `erlangCookie` and `cookieAuthSecret` specifiable in
`extraSecret` (#195)
00e3329 is described below
commit 00e3329f95a077bb58b0e78b358d25037dc3cfe2
Author: Jakub Kropáček <43576992+justscre...@users.noreply.github.com>
AuthorDate: Sat Jul 26 15:53:30 2025 +0200
Make `erlangCookie` and `cookieAuthSecret` specifiable in `extraSecret`
(#195)
Make erlangCookie and cookieAuthSecret specifyable in extraSecret
---
couchdb/Chart.yaml | 2 +-
couchdb/NEWS.md | 3 +++
couchdb/README.md | 12 +++++++-----
couchdb/templates/statefulset.yaml | 8 ++++----
couchdb/values.yaml | 2 ++
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
index 0add32a..0f8b711 100644
--- a/couchdb/Chart.yaml
+++ b/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
diff --git a/couchdb/NEWS.md b/couchdb/NEWS.md
index 336af84..bf134f6 100644
--- a/couchdb/NEWS.md
+++ b/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
diff --git a/couchdb/README.md b/couchdb/README.md
index b2d8615..5389ed6 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -1,6 +1,6 @@
# CouchDB
-
+
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
|
diff --git a/couchdb/templates/statefulset.yaml
b/couchdb/templates/statefulset.yaml
index e3710a9..7ad01d0 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/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 }}
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
index 0284d13..c4a7cac 100644
--- a/couchdb/values.yaml
+++ b/couchdb/values.yaml
@@ -40,6 +40,8 @@ createAdminSecret: true
extraSecretName: ""
adminUsernameKey: ""
adminPasswordKey: ""
+cookieAuthSecretKey: ""
+erlangCookieKey: ""
adminUsername: admin
# adminPassword: this_is_not_secure
