From e615343e219ee091fcdf7ac29201ed665996f7a2 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Thu, 4 Feb 2021 18:26:23 +0100 Subject: [PATCH] [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 Change-Id: Ief6fcdf18b9bea1bff728924d7c9a25465ac8a47 --- kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml | 2 +- kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml index f653a02cff..40a4d7db93 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: {{ include "repositoryGenerator.image.logging" . }} diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml index a43073e8e2..5c94116bac 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: {{ include "repositoryGenerator.image.logging" . }} -- 2.16.6