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
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 40b0b86..3506f89 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -18,10 +18,10 @@
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 }}
