From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 4 Feb 2021 17:26:23 +0000 (+0100)
Subject: [DMAAP][DR] Fix bad templating
X-Git-Tag: 7.0.1~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F119691%2F1;p=oom.git

[DMAAP][DR] Fix bad templating

In DR deployments, use of `{{- end -}}` at the of affinity makes the
next line to "glue" to resources information.
And it seems that in recent kubernetes, it makes it break.

Issue-ID: OOM-2671
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ief6fcdf18b9bea1bff728924d7c9a25465ac8a47
(cherry picked from commit e615343e219ee091fcdf7ac29201ed665996f7a2)
---

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
index 262e074f03..6496792a37 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
@@ -87,7 +87,7 @@ spec:
         {{- end -}}
         {{- if .Values.affinity }}
         affinity: {{ toYaml .Values.affinity | nindent 10 }}
-        {{- end -}}
+        {{- end }}
         # Filebeat sidecar container
         - name: {{ include "common.name" . }}-filebeat-onap
           image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index 0655d7c13f..28eee93a4e 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@ -105,7 +105,7 @@ spec:
         {{- if .Values.affinity }}
         affinity:
 {{ toYaml .Values.affinity | indent 10 }}
-        {{- end -}}
+        {{- end }}
       # Filebeat sidecar container
         - name: {{ include "common.name" . }}-filebeat-onap
           image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"