Skip to content
Permalink
Browse files
Bump chart to 3.4.0 CouchDB to 3.2.0
- add support for built-in prometheus metrics

Signed-off-by: Stephen Gregory <stephen@epsilon3.io>
  • Loading branch information
sag committed Nov 1, 2021
1 parent 633c8ff commit 252e73b96139702f19d1f46e44ec6fceacef7f32
Showing 9 changed files with 70 additions and 7 deletions.
@@ -1,7 +1,7 @@
apiVersion: v1
name: couchdb
version: 3.3.4
appVersion: 3.1.1
version: 3.4.0
appVersion: 3.2.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
reliability.
@@ -168,7 +168,7 @@ A variety of other parameters are also configurable. See the comments in the
| `adminHash` | |
| `cookieAuthSecret` | auto-generated |
| `image.repository` | couchdb |
| `image.tag` | 3.1.1 |
| `image.tag` | 3.2.0 |
| `image.pullPolicy` | IfNotPresent |
| `searchImage.repository` | kocolosk/couchdb-search |
| `searchImage.tag` | 0.1.0 |
@@ -210,7 +210,9 @@ A variety of other parameters are also configurable. See the comments in the
| `readinessProbe.periodSeconds` | 10 |
| `readinessProbe.successThreshold` | 1 |
| `readinessProbe.timeoutSeconds` | 1 |

| `prometheusPort.enabled` | false |
| `prometheusPort.port` | 17896 |
| `prometheusPort.bind_address` | 0.0.0.0 |
## Feedback, Issues, Contributing

General feedback is welcome at our [user][1] or [developer][2] mailing lists.
@@ -21,3 +21,11 @@ data:
seedlistinifile: |
[cluster]
seedlist = {{ template "couchdb.seedlist" . }}
{{- if .Values.prometheusPort.enabled }}
prometheusinifile: |
[prometheus]
additional_port = {{ .Values.prometheusPort.enabled }}
bind_address = {{ .Values.prometheusPort.bind_address }}
port = {{ .Values.prometheusPort.port }}
{{- end }}
@@ -13,5 +13,9 @@ spec:
ports:
- name: couchdb
port: 5984
{{- if .Values.prometheusPort.enabled }}
- name: metrics
port: {{ .Values.prometheusPort.port }}
{{- end }}
selector:
{{ include "couchdb.ss.selector" . | indent 4 }}
@@ -17,6 +17,10 @@ spec:
- ports:
- protocol: TCP
port: 5984
{{- if .Values.prometheusPort.enabled }}
- protocol: TCP
port: {{ .Values.prometheusPort.port }}
{{- end }}
- ports:
- protocol: TCP
port: 9100
@@ -34,7 +34,14 @@ spec:
- name: init-copy
image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
imagePullPolicy: {{ .Values.initImage.pullPolicy }}
command: ['sh','-c','cp /tmp/chart.ini /default.d; cp /tmp/seedlist.ini /default.d; ls -lrt /default.d;']
command:
- 'sh'
- '-c'
{{- if .Values.prometheusPort.enabled }}
- 'cp /tmp/chart.ini /default.d; cp /tmp/seedlist.ini /default.d; cp /tmp/prometheus.ini /default.d; ls -lrt /default.d;'
{{- else }}
- 'cp /tmp/chart.ini /default.d; cp /tmp/seedlist.ini /default.d; ls -lrt /default.d;'
{{- end }}
volumeMounts:
- name: config
mountPath: /tmp/
@@ -62,6 +69,10 @@ spec:
- name: epmd
containerPort: 4369
- containerPort: 9100
{{- if .Values.prometheusPort.enabled }}
- name: metrics
containerPort: {{ .Values.prometheusPort.port }}
{{- end }}
env:
{{- if not .Values.allowAdminParty }}
- name: COUCHDB_USER
@@ -165,6 +176,10 @@ spec:
path: chart.ini
- key: seedlistinifile
path: seedlist.ini
{{- if .Values.prometheusPort.enabled }}
- key: prometheusinifile
path: prometheus.ini
{{- end }}

{{- if .Values.adminHash }}
- name: local-config-storage
@@ -60,7 +60,7 @@ persistentVolume:
## The CouchDB image
image:
repository: couchdb
tag: 3.1.1
tag: 3.2.0
pullPolicy: IfNotPresent

## Experimental integration with Lucene-powered fulltext search
@@ -189,6 +189,13 @@ readinessProbe:
successThreshold: 1
timeoutSeconds: 1

# CouchDB 3.2.0 adds in a metrics endpoint on the path `/_node/_local/_prometheus`.
# Optionally, a standalone, unauthenticated port can be exposed for these metrics.
prometheusPort:
enabled: false
bind_address: "0.0.0.0"
port: 17986

# Configure arbitrary sidecar containers for CouchDB pods created by the
# StatefulSet
sidecars: {}
BIN +9.63 KB docs/couchdb-3.4.0.tgz
Binary file not shown.
@@ -1,6 +1,29 @@
apiVersion: v1
entries:
couchdb:
- apiVersion: v1
appVersion: 3.2.0
created: "2021-11-01T11:58:35.829781-04:00"
description: A database featuring seamless multi-master sync, that scales from
big data to mobile, with an intuitive HTTP/JSON API and designed for reliability.
digest: f02403a6e33116ca8ac7d4cf438e6fd449628be2624c54e4fab4598b368a99f8
home: https://couchdb.apache.org/
icon: http://couchdb.apache.org/CouchDB-visual-identity/logo/CouchDB-couch-symbol.svg
keywords:
- couchdb
- database
- nosql
maintainers:
- email: kocolosk@apache.org
name: kocolosk
- email: willholley@apache.org
name: willholley
name: couchdb
sources:
- https://github.com/apache/couchdb-docker
urls:
- https://apache.github.io/couchdb-helm/couchdb-3.4.0.tgz
version: 3.4.0
- apiVersion: v1
appVersion: 3.1.1
created: "2021-07-19T17:06:48.703104-04:00"
@@ -277,4 +300,4 @@ entries:
urls:
- https://apache.github.io/couchdb-helm/couchdb-2.2.0.tgz
version: 2.2.0
generated: "2021-07-19T17:06:48.70203-04:00"
generated: "2021-11-01T11:58:35.8284-04:00"

0 comments on commit 252e73b

Please sign in to comment.