You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wi...@apache.org on 2019/10/22 17:27:38 UTC
[couchdb-helm] 01/07: Add support for pod annotations
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit 1a84cb26b04966f66843de510d0ed23cbf2b525c
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 13:51:50 2019 +0100
Add support for pod annotations
Ported from https://github.com/helm/charts/pull/17262.
Thanks to @Pinpin31.
---
couchdb/Chart.yaml | 2 +-
couchdb/README.md | 1 +
couchdb/templates/statefulset.yaml | 4 ++++
couchdb/values.yaml | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
index 1d33948..5c617f8 100644
--- a/couchdb/Chart.yaml
+++ b/couchdb/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
name: couchdb
-version: 2.2.0
+version: 2.2.1
appVersion: 2.3.1
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/README.md b/couchdb/README.md
index a0bfc15..a055b12 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -131,6 +131,7 @@ A variety of other parameters are also configurable. See the comments in the
| `persistentVolume.storageClass` | Default for the Kube cluster |
| `podManagementPolicy` | Parallel |
| `affinity` | |
+| `annotations` | |
| `resources` | |
| `service.annotations` | |
| `service.enabled` | true |
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
index fab2c36..416b594 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -18,6 +18,10 @@ spec:
metadata:
labels:
{{ include "couchdb.ss.selector" . | indent 8 }}
+{{- with .Values.annotations }}
+ annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
spec:
{{- if .Values.schedulerName }}
schedulerName: "{{ .Values.schedulerName }}"
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
index e3461dd..ab75a1d 100644
--- a/couchdb/values.yaml
+++ b/couchdb/values.yaml
@@ -80,6 +80,9 @@ affinity:
# - couchdb
# topologyKey: "kubernetes.io/hostname"
+## Optional pod annotations
+annotations:
+
## A StatefulSet requires a headless Service to establish the stable network
## identities of the Pods, and that Service is created automatically by this
## chart without any additional configuration. The Service block below refers