From 2e6e0a9458c4445f2ba5d273cc3e7e00580a8707 Mon Sep 17 00:00:00 2001
From: Jon Davies <jpds@protonmail.com>
Date: Mon, 25 Mar 2019 17:18:17 +0000
Subject: [PATCH] [incubator/couchdb] service.yaml: Added annotations option.
 (#12211)

Signed-off-by: Jonathan Davies <jpds@protonmail.com>
---
 incubator/couchdb/Chart.yaml             | 2 +-
 incubator/couchdb/README.md              | 1 +
 incubator/couchdb/templates/service.yaml | 4 ++++
 incubator/couchdb/values.yaml            | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/incubator/couchdb/Chart.yaml b/incubator/couchdb/Chart.yaml
index 657d1d905d..5d10010124 100644
--- a/incubator/couchdb/Chart.yaml
+++ b/incubator/couchdb/Chart.yaml
@@ -1,5 +1,5 @@
 name: couchdb
-version: 1.1.1
+version: 1.1.2
 appVersion: 2.3.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/incubator/couchdb/README.md b/incubator/couchdb/README.md
index 7cd31a8b81..9440d59295 100644
--- a/incubator/couchdb/README.md
+++ b/incubator/couchdb/README.md
@@ -125,6 +125,7 @@ A variety of other parameters are also configurable. See the comments in the
 | `podManagementPolicy`           | Parallel                               |
 | `affinity`                      |                                        |
 | `resources`                     |                                        |
+| `service.annotations`           |                                        |
 | `service.enabled`               | true                                   |
 | `service.type`                  | ClusterIP                              |
 | `service.externalPort`          | 5984                                   |
diff --git a/incubator/couchdb/templates/service.yaml b/incubator/couchdb/templates/service.yaml
index 3393d0447b..d4325b903b 100644
--- a/incubator/couchdb/templates/service.yaml
+++ b/incubator/couchdb/templates/service.yaml
@@ -8,6 +8,10 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
 spec:
   ports:
     - port: {{ .Values.service.externalPort }}
diff --git a/incubator/couchdb/values.yaml b/incubator/couchdb/values.yaml
index d1a9816964..ee8c754577 100644
--- a/incubator/couchdb/values.yaml
+++ b/incubator/couchdb/values.yaml
@@ -77,6 +77,7 @@ affinity:
 ## chart without any additional configuration. The Service block below refers
 ## to a second Service that governs how clients connect to the CouchDB cluster.
 service:
+  # annotations:
   enabled: true
   type: ClusterIP
   externalPort: 5984