diff --git a/CHANGELOG.md b/CHANGELOG.md index cbae84757ea84922ab7c4dc1375bc0de1255a927..ec21778df08c66b673f0d33a1796e708f5dc6403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [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 diff --git a/Chart.yaml b/Chart.yaml index a60676fa7c2e9a5bcb3ba121027a5b870a26269a..fbb8f8f9e737d34f8a779c9ac125f656cb2f8eaf 100644 --- a/Chart.yaml +++ b/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 diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index 7254825178a78d2283e9ff088de795cecb11ec50..d8c09dac180256770a71b7cf97d65cf77d257959 100644 --- a/templates/statefulset.yaml +++ b/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 }} diff --git a/values.yaml b/values.yaml index 95a9ffa700aa0876b43fc7d4371261af7e97a4a3..cd8257dd8ddd62ca0022de970905eeedc4c2f630 100644 --- a/values.yaml +++ b/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: