From 8ce67864beba9773fa457c9b6de2113106fe91b0 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 29 May 2024 13:39:50 +0200 Subject: [PATCH] fix --- .../templates/ingress.yaml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/charts/scorpio-broker-aaio/templates/ingress.yaml b/charts/scorpio-broker-aaio/templates/ingress.yaml index c16d18e3..d930bafd 100644 --- a/charts/scorpio-broker-aaio/templates/ingress.yaml +++ b/charts/scorpio-broker-aaio/templates/ingress.yaml @@ -1,25 +1,27 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "scorpioBroker-aaio.fullname" . -}} -{{- $svcPort := .Values.service.port -}} + {{- $fullName := include "scorpioBroker-aaio.fullname" . -}} + {{- $servicePort := .Values.service.port -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ $fullName }} + name: {{ include "scorpioBroker-aaio.fullname" . }} namespace: {{ $.Release.Namespace | quote }} labels: - {{- include "scorpioBroker-aaio.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} + {{ include "scorpioBroker-aaio.labels" . | nindent 4 }} + {{- if .Values.ingress.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- with .Values.ingress.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} spec: {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} + {{- range .hosts }} + - {{ . | quote }} + {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} @@ -38,4 +40,4 @@ spec: number: {{ $servicePort }} {{- end }} {{- end }} -{{- end }} +{{- end }} \ No newline at end of file