[couchdb-helm] 01/01: Fix chart rendering when annotations specified

[wi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

willholley pushed a commit to branch annotations_fix
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git

commit 2ac1f5871d09511d33d88661de54c426ee407f69
Author: Will Holley <wi...@uk.ibm.com>
AuthorDate: Wed Aug 5 11:38:45 2020 +0100

    Fix chart rendering when annotations specified
    
    Commit 70b2777edd3b792c30dd025097ee598b64a45efa caused user-provided
    annotations to break the `checksum` StatefulSet annotations. The
    `{{ with .Values.annotations }}` instruction changes the scope
    under which the checksum is calculated when user annotations are present.
    
    This removes the `{{ with .Values.annotations }}` and instead just
    writes out the user-provided annotations directly.
    
    I've also added a user-provided annotation to the `values.yaml` used
    in the smoke test to verify the fix.
    
    Fixes #37
---
 couchdb/Chart.yaml                 |   2 +-
 couchdb/ci/required-values.yaml    |   2 ++
 couchdb/templates/statefulset.yaml |   4 ++--
 docs/couchdb-3.3.4.tgz             | Bin 0 -> 9551 bytes
 docs/index.yaml                    |  25 ++++++++++++++++++++++++-
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
index 206f9c0..16973ae 100644
--- a/couchdb/Chart.yaml
+++ b/couchdb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: couchdb
-version: 3.3.3
+version: 3.3.4
 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/ci/required-values.yaml b/couchdb/ci/required-values.yaml
index 79589d2..15b64b9 100644
--- a/couchdb/ci/required-values.yaml
+++ b/couchdb/ci/required-values.yaml
@@ -1,3 +1,5 @@
 couchdbConfig:
   couchdb:
     uuid: "decafbaddecafbaddecafbaddecafbad"
+annotations:
+  foo: bar
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
index 6225fbe..e6ca9b4 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -18,10 +18,10 @@ spec:
     metadata:
       labels:
 {{ include "couchdb.ss.selector" . | indent 8 }}
-{{- with .Values.annotations }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-{{ toYaml . | indent 8 }}
+{{- if .Values.annotations }}
+{{ toYaml .Values.annotations | indent 8 }}
 {{- end }}
     spec:
       {{- if .Values.schedulerName }}
diff --git a/docs/couchdb-3.3.4.tgz b/docs/couchdb-3.3.4.tgz
new file mode 100644
index 0000000..03ae6e5
Binary files /dev/null and b/docs/couchdb-3.3.4.tgz differ
diff --git a/docs/index.yaml b/docs/index.yaml
index 30ac00b..986205a 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,6 +3,29 @@ entries:
   couchdb:
   - apiVersion: v1
     appVersion: 2.3.1
+    created: "2020-08-05T11:38:37.524289+01: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: 3f8259ea9218aeee5bae5a986253498bdedcfb06f2df17d06b0f5800cee71128
+    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.3.4.tgz
+    version: 3.3.4
+  - apiVersion: v1
+    appVersion: 2.3.1
     created: "2020-07-20T15:42:59.616958-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.
@@ -254,4 +277,4 @@ entries:
     urls:
     - https://apache.github.io/couchdb-helm/couchdb-2.2.0.tgz
     version: 2.2.0
-generated: "2020-07-20T15:42:59.615571-04:00"
+generated: "2020-08-05T11:38:37.523238+01:00"