Merge branch 'master' into 89-update-mariadb-chart-version

CHANGELOG.md

@@ -9,6 +9,10 @@
   [mariadb chart upgrade notes](
   https://artifacthub.io/packages/helm/bitnami/mariadb/9.6.0#to-8-0-0)
 
+## [0.2.2] - 2021-09-22
+
+* Remove duplicate key `checksum/config` from template
+
 ## [0.2.1] - 2021-09-16
 
 * Allow setting custom labels on pods and statefulset

Chart.yaml

@@ -5,7 +5,7 @@ description: WordPress with a replicated MariaDB backend
 name: wordpress
 # Please only change the chart version as part of the release procedure: see
 # RELEASING.md
-version: 0.2.1
+version: 0.2.2
 icon: https://make.wordpress.org/design/files/2016/09/WordPress-logotype-wmark.png
 dependencies:
   - name: mariadb

templates/statefulset.yaml

@@ -27,8 +27,7 @@ spec:
       annotations:
         # Reload the pod when values-local.yaml changes, so the ansible playbook
         # gets re-run.
-        checksum/config: {{ include (print $.Template.BasePath "/ansible-vars.yaml") . | sha256sum }}
-        checksum/config: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+        checksum/config: {{ printf "%s%s" (include (print $.Template.BasePath "/ansible-vars.yaml") .) (include (print $.Template.BasePath "/secrets.yaml") .) | sha256sum }}
         {{- if .Values.podAnnotations }}
         {{- toYaml .Values.podAnnotations | nindent 8 }}
         {{- end }}

values.yaml

@@ -241,13 +241,13 @@ ansibleVars:
 
 image:
   repository: open.greenhost.net:4567/openappstack/wordpress-helm/wordpress
-  tag: 0.2.1
+  tag: 0.2.2
   pullPolicy: Always
   pullSecrets: []
 
 initImage:
   repository: open.greenhost.net:4567/openappstack/wordpress-helm/wordpress-cli-ansible
-  tag: 0.2.1
+  tag: 0.2.2
   pullPolicy: Always
 
 ingress: