From 61ae063d5ed52a92729d1f4b34e826947c914c19 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Fri, 12 Nov 2021 01:32:37 -0500
Subject: [PATCH] designate: Fix extra volume mounts

This patch fixes the code for adding extra mounts
for the Designate pods, it would otherwise
generate invalid YAML.

Change-Id: I7126e20090714db85f571a3a6a80ea2fc4e069d5
---
 designate/Chart.yaml                         | 2 +-
 designate/templates/deployment-api.yaml      | 4 ++--
 designate/templates/deployment-central.yaml  | 4 ++--
 designate/templates/deployment-mdns.yaml     | 4 ++--
 designate/templates/deployment-producer.yaml | 4 ++--
 designate/templates/deployment-sink.yaml     | 4 ++--
 designate/templates/deployment-worker.yaml   | 6 +++---
 designate/templates/job-bootstrap.yaml       | 4 ++--
 releasenotes/notes/designate.yaml            | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/designate/Chart.yaml b/designate/Chart.yaml
index 369220c354..dd1bbbb35d 100644
--- a/designate/Chart.yaml
+++ b/designate/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Designate
 name: designate
-version: 0.2.2
+version: 0.2.3
 home: https://docs.openstack.org/designate/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Designate/OpenStack_Project_Designate_vertical.jpg
 sources:
diff --git a/designate/templates/deployment-api.yaml b/designate/templates/deployment-api.yaml
index 43531ec8db..03e10f0678 100644
--- a/designate/templates/deployment-api.yaml
+++ b/designate/templates/deployment-api.yaml
@@ -96,7 +96,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_api.volumeMounts }}{{ toYaml $mounts_designate_api.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_api.volumeMounts }}{{ toYaml $mounts_designate_api.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-designate
           emptyDir: {}
@@ -110,5 +110,5 @@ spec:
           secret:
             secretName: designate-etc
             defaultMode: 0444
-{{- if $mounts_designate_api.volumes }}{{ toYaml $mounts_designate_api.volumes | indent 8 }}{{ end }}
+{{ if $mounts_designate_api.volumes }}{{ toYaml $mounts_designate_api.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/designate/templates/deployment-central.yaml b/designate/templates/deployment-central.yaml
index 22cb398480..02d9f3ca95 100644
--- a/designate/templates/deployment-central.yaml
+++ b/designate/templates/deployment-central.yaml
@@ -83,7 +83,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_central.volumeMounts }}{{ toYaml $mounts_designate_central.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_central.volumeMounts }}{{ toYaml $mounts_designate_central.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-designate
           emptyDir: {}
@@ -97,5 +97,5 @@ spec:
           secret:
             secretName: designate-etc
             defaultMode: 0444
-{{- if $mounts_designate_central.volumes }}{{ toYaml $mounts_designate_central.volumes | indent 8 }}{{ end }}
+{{ if $mounts_designate_central.volumes }}{{ toYaml $mounts_designate_central.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/designate/templates/deployment-mdns.yaml b/designate/templates/deployment-mdns.yaml
index 93fe35d9fe..d58f630411 100644
--- a/designate/templates/deployment-mdns.yaml
+++ b/designate/templates/deployment-mdns.yaml
@@ -94,7 +94,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_mdns.volumeMounts }}{{ toYaml $mounts_designate_mdns.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_mdns.volumeMounts }}{{ toYaml $mounts_designate_mdns.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-designate
           emptyDir: {}
@@ -108,5 +108,5 @@ spec:
           secret:
             secretName: designate-etc
             defaultMode: 0444
-{{- if $mounts_designate_mdns.volumes }}{{ toYaml $mounts_designate_mdns.volumes | indent 8 }}{{ end }}
+{{ if $mounts_designate_mdns.volumes }}{{ toYaml $mounts_designate_mdns.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/designate/templates/deployment-producer.yaml b/designate/templates/deployment-producer.yaml
index 23ba4a6a22..491dbad854 100644
--- a/designate/templates/deployment-producer.yaml
+++ b/designate/templates/deployment-producer.yaml
@@ -83,7 +83,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_producer.volumeMounts }}{{ toYaml $mounts_designate_producer.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_producer.volumeMounts }}{{ toYaml $mounts_designate_producer.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-designate
           emptyDir: {}
@@ -97,5 +97,5 @@ spec:
           secret:
             secretName: designate-etc
             defaultMode: 0444
-{{- if $mounts_designate_producer.volumes }}{{ toYaml $mounts_designate_producer.volumes | indent 8 }}{{ end }}
+{{ if $mounts_designate_producer.volumes }}{{ toYaml $mounts_designate_producer.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/designate/templates/deployment-sink.yaml b/designate/templates/deployment-sink.yaml
index 4f8d7a8f21..e577d9d890 100644
--- a/designate/templates/deployment-sink.yaml
+++ b/designate/templates/deployment-sink.yaml
@@ -79,7 +79,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_sink.volumeMounts }}{{ toYaml $mounts_designate_sink.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_sink.volumeMounts }}{{ toYaml $mounts_designate_sink.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-designate
           emptyDir: {}
@@ -93,5 +93,5 @@ spec:
           secret:
             secretName: designate-etc
             defaultMode: 0444
-{{- if $mounts_designate_sink.volumes }}{{ toYaml $mounts_designate_sink.volumes | indent 8 }}{{ end }}
+{{ if $mounts_designate_sink.volumes }}{{ toYaml $mounts_designate_sink.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/designate/templates/deployment-worker.yaml b/designate/templates/deployment-worker.yaml
index 9c252f55a0..74f9c998f7 100644
--- a/designate/templates/deployment-worker.yaml
+++ b/designate/templates/deployment-worker.yaml
@@ -72,7 +72,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_worker.volumeMounts }}{{ toYaml $mounts_designate_worker.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_worker.volumeMounts }}{{ toYaml $mounts_designate_worker.volumeMounts | indent 12 }}{{ end }}
       containers:
         - name: designate-worker
 {{ tuple $envAll "designate_worker" | include "helm-toolkit.snippets.image" | indent 10 }}
@@ -108,7 +108,7 @@ spec:
               subPath: {{ base .Values.conf.designate.DEFAULT.log_config_append }}
               readOnly: true
             {{- end }}
-{{- if $mounts_designate_worker.volumeMounts }}{{ toYaml $mounts_designate_worker.volumeMounts | indent 12 }}{{ end }}
+{{ if $mounts_designate_worker.volumeMounts }}{{ toYaml $mounts_designate_worker.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-designate
           emptyDir: {}
@@ -122,5 +122,5 @@ spec:
           secret:
             secretName: designate-etc
             defaultMode: 0444
-{{- if $mounts_designate_worker.volumes }}{{ toYaml $mounts_designate_worker.volumes | indent 8 }}{{ end }}
+{{ if $mounts_designate_worker.volumes }}{{ toYaml $mounts_designate_worker.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/designate/templates/job-bootstrap.yaml b/designate/templates/job-bootstrap.yaml
index 15f7a91f25..dc4350e256 100644
--- a/designate/templates/job-bootstrap.yaml
+++ b/designate/templates/job-bootstrap.yaml
@@ -47,12 +47,12 @@ spec:
               mountPath: /tmp/bootstrap.sh
               subPath: bootstrap.sh
               readOnly: true
-{{- if $mounts_designate_bootstrap.volumeMounts }}{{ toYaml $mounts_designate_bootstrap.volumeMounts | indent 10 }}{{ end }}
+{{ if $mounts_designate_bootstrap.volumeMounts }}{{ toYaml $mounts_designate_bootstrap.volumeMounts | indent 10 }}{{ end }}
       volumes:
         - name: designate-bin
           configMap:
             name: designate-bin
             defaultMode: 0555
-{{- if $mounts_designate_bootstrap.volumes }}{{ toYaml $mounts_designate_bootstrap.volumes | indent 6 }}{{ end }}
+{{ if $mounts_designate_bootstrap.volumes }}{{ toYaml $mounts_designate_bootstrap.volumes | indent 6 }}{{ end }}
 {{- end }}
 {{- end }}
diff --git a/releasenotes/notes/designate.yaml b/releasenotes/notes/designate.yaml
index d6f93b31a0..3a5aac8176 100644
--- a/releasenotes/notes/designate.yaml
+++ b/releasenotes/notes/designate.yaml
@@ -6,4 +6,4 @@ designate:
   - 0.2.0 Remove support for releases before T
   - 0.2.1 Use policies in yaml format
   - 0.2.2 Update htk requirements repo
-...
+  - 0.2.3 Fix extra volume mounts