From f844a4304a95ec7329a809daea8fad592f591618 Mon Sep 17 00:00:00 2001 From: Ramneek Gupta <35722525+ramneekgupta91@users.noreply.github.com> Date: Tue, 13 Aug 2019 19:09:41 +0100 Subject: [PATCH] [stable/chartmuseum] added the fix for the issue - service.servicename in values breaking ingress (#16285) * added the fix for the issue - service.servicename breaking ingress Signed-off-by: Ramneek Gupta * bumped the chart version Signed-off-by: Ramneek Gupta * removed newline Signed-off-by: Ramneek Gupta --- stable/chartmuseum/Chart.yaml | 2 +- stable/chartmuseum/templates/ingress.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stable/chartmuseum/Chart.yaml b/stable/chartmuseum/Chart.yaml index 0d6922d0d3..e7a17b7780 100644 --- a/stable/chartmuseum/Chart.yaml +++ b/stable/chartmuseum/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Host your own Helm Chart Repository name: chartmuseum -version: 2.3.1 +version: 2.3.2 appVersion: 0.8.2 home: https://github.com/helm/chartmuseum icon: https://raw.githubusercontent.com/helm/chartmuseum/master/logo2.png diff --git a/stable/chartmuseum/templates/ingress.yaml b/stable/chartmuseum/templates/ingress.yaml index b3131c118a..59d969362e 100644 --- a/stable/chartmuseum/templates/ingress.yaml +++ b/stable/chartmuseum/templates/ingress.yaml @@ -23,12 +23,20 @@ spec: {{- range $ingressExtraPaths }} - path: {{ default "/" .path | quote }} backend: + {{- if $.Values.service.servicename }} + serviceName: {{ $.Values.service.servicename }} + {{- else }} serviceName: {{ default $serviceName .service }} + {{- end }} servicePort: {{ default $servicePort .port }} {{- end }} - path: {{ default "/" .path | quote }} backend: - serviceName: {{ default $serviceName .serviceName }} + {{- if $.Values.service.servicename }} + serviceName: {{ $.Values.service.servicename }} + {{- else }} + serviceName: {{ default $serviceName .service }} + {{- end }} servicePort: {{ default $servicePort .servicePort }} {{- end }} tls: