From 688d6ce649844f64d0836e9fcad97b2c774d4370 Mon Sep 17 00:00:00 2001 From: jmarchel7bulls Date: Wed, 15 May 2024 12:07:47 +0200 Subject: [PATCH] Fix naming of the ingress frontend Change-Id: I99fe581c830a2508a0a85ad78fe768ef466dbe74 --- .../templates/ingress-frontend.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nebulous-cloud-fog-service-broker/templates/ingress-frontend.yaml b/charts/nebulous-cloud-fog-service-broker/templates/ingress-frontend.yaml index 65bd17e..2d0d012 100644 --- a/charts/nebulous-cloud-fog-service-broker/templates/ingress-frontend.yaml +++ b/charts/nebulous-cloud-fog-service-broker/templates/ingress-frontend.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "nebulous-cloud-fog-service-broker.frontend.fullname" . -}} +{{- $fullName := include "nebulous-cloud-fog-service-broker.fullname" . -}} {{- $svcPort := .Values.service.guiPort -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} @@ -15,7 +15,7 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} + name: {{ $fullName }}-frontend labels: {{- include "nebulous-cloud-fog-service-broker.frontend.labels" . | nindent 4 }} {{- with .Values.frontend.ingress.annotations }} @@ -49,11 +49,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ $fullName }} + name: {{ $fullName }}-frontend port: number: {{ $svcPort }} {{- else }} - serviceName: {{ $fullName }} + serviceName: {{ $fullName }}-frontend servicePort: {{ $svcPort }} {{- end }} {{- end }}