diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-04 18:26:23 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-03-24 16:10:34 +0000 |
| commit | 152c430f7f7914d72a7820aba3264ab780b056c2 (patch) | |
| tree | abac03172ef5896055f3eb46c78b33a58056dc94 | |
| parent | fbb7f16ad6808cd2d188a2e5c0c2724c4dca17bc (diff) | |
[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)
| -rw-r--r-- | kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml | 2 | ||||
| -rw-r--r-- | 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 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 }}" |