From: Alexis de Talhouƫt Date: Mon, 2 Sep 2019 19:02:08 +0000 (+0000) Subject: Merge "Fix syntax and indentation in ingress common template." X-Git-Tag: 5.0.1-ONAP~111 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=aaabd14bc5a271077952648b8b97a689c3a37fc3;hp=bc0abc02f0889bd4e32333a9abed152b2e98d8fb;p=oom.git Merge "Fix syntax and indentation in ingress common template." --- diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl index 9b274ad190..49d7eeb415 100644 --- a/kubernetes/common/common/templates/_ingress.tpl +++ b/kubernetes/common/common/templates/_ingress.tpl @@ -6,12 +6,12 @@ backend: serviceName: {{ .name }} servicePort: {{ .port }} -{{- end }} +{{- end -}} {{- else -}} - - path: {{ printf "/%s" .Chart.Name }} - backend: - serviceName: {{ .Chart.Name }} - servicePort: {{ .Values.service.externalPort }} + - path: {{ printf "/%s" .Chart.Name }} + backend: + serviceName: {{ .Chart.Name }} + servicePort: {{ .Values.service.externalPort }} {{- end -}} {{- end -}} {{- end -}} @@ -44,7 +44,7 @@ spec: rules: - http: paths: - {{- include "ingress.config.port" . }} + {{- include "ingress.config.port" . }} {{- if .Values.ingress.tls }} tls: {{ toYaml .Values.ingress.tls | indent 4 }}