From a56354146b2fbc518bdb2a0fc7f28a6657575e48 Mon Sep 17 00:00:00 2001
From: Michele Melluso <mmelluso@topcon.com>
Date: Wed, 16 Feb 2022 21:13:31 +0100
Subject: [PATCH 1/3] Support string type in ingress service port

---
 src/chartmuseum/templates/ingress.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/chartmuseum/templates/ingress.yaml b/src/chartmuseum/templates/ingress.yaml
index e4b7d10..e0ff14e 100644
--- a/src/chartmuseum/templates/ingress.yaml
+++ b/src/chartmuseum/templates/ingress.yaml
@@ -49,7 +49,11 @@ spec:
             name: {{ default $serviceName .service }}
             {{- end }}
             port:
+              {{- if kindIs "string" (default $servicePort .port) }}
+              name: {{ default $servicePort .port }}
+              {{- else }}
               number: {{ default $servicePort .port }}
+              {{- end }}
         pathType: {{ default $.Values.ingress.pathType .pathType }}
         {{- end }}
       {{- end }}
@@ -70,7 +74,11 @@ spec:
             name: {{ default $serviceName .service }}
             {{- end }}
             port:
+              {{- if kindIs "string" (default $servicePort .port) }}
+              name: {{ default $servicePort .port }}
+              {{- else }}
               number: {{ default $servicePort .port }}
+              {{- end }}
         pathType: {{ $.Values.ingress.pathType }}
         {{- end }}
   {{- end }}

From 91a22b03c2384ce497c208d4506db63f6b3c2cee Mon Sep 17 00:00:00 2001
From: Chris Boyd <6323077+cpboyd@users.noreply.github.com>
Date: Tue, 3 May 2022 16:16:59 -0400
Subject: [PATCH 2/3] fix: service.servicename overrides all services

---
 src/chartmuseum/templates/ingress.yaml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/chartmuseum/templates/ingress.yaml b/src/chartmuseum/templates/ingress.yaml
index e0ff14e..53e7b6b 100644
--- a/src/chartmuseum/templates/ingress.yaml
+++ b/src/chartmuseum/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled }}
 {{- $servicePort := .Values.service.externalPort -}}
-{{- $serviceName := include "chartmuseum.fullname" . -}}
+{{- $serviceName := default (include "chartmuseum.fullname" .) .Values.service.servicename -}}
 {{- $ingressExtraPaths := .Values.ingress.extraPaths -}}
 ---
 {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
@@ -35,19 +35,11 @@ spec:
       - path: {{ default "/" .path | quote }}
         backend:
         {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-          {{- if $.Values.service.servicename }}
-          serviceName: {{ $.Values.service.servicename }}
-          {{- else }}
           serviceName: {{ default $serviceName .service }}
-          {{- end }}
           servicePort: {{ default $servicePort .port }}
         {{- else }}
           service:
-            {{- if $.Values.service.servicename }}
-            name: {{ $.Values.service.servicename }}
-            {{- else }}
             name: {{ default $serviceName .service }}
-            {{- end }}
             port:
               {{- if kindIs "string" (default $servicePort .port) }}
               name: {{ default $servicePort .port }}
@@ -60,19 +52,11 @@ spec:
       - path: {{ default "/" .path | quote }}
         backend:
         {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-          {{- if $.Values.service.servicename }}
-          serviceName: {{ $.Values.service.servicename }}
-          {{- else }}
           serviceName: {{ default $serviceName .service }}
-          {{- end }}
           servicePort: {{ default $servicePort .servicePort }}
         {{- else }}
           service:
-            {{- if $.Values.service.servicename }}
-            name: {{ $.Values.service.servicename }}
-            {{- else }}
             name: {{ default $serviceName .service }}
-            {{- end }}
             port:
               {{- if kindIs "string" (default $servicePort .port) }}
               name: {{ default $servicePort .port }}

From e02b73dac3301819fb662e05dc7e8f0ed38cd180 Mon Sep 17 00:00:00 2001
From: Chris Boyd <6323077+cpboyd@users.noreply.github.com>
Date: Tue, 3 May 2022 02:59:16 -0400
Subject: [PATCH 3/3] bump: chart version to 3.7.2

---
 src/chartmuseum/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chartmuseum/Chart.yaml b/src/chartmuseum/Chart.yaml
index a602919..0eaec15 100644
--- a/src/chartmuseum/Chart.yaml
+++ b/src/chartmuseum/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Host your own Helm Chart Repository
 name: chartmuseum
-version: 3.7.1
+version: 3.7.2
 appVersion: 0.14.0
 home: https://github.com/helm/chartmuseum
 icon: https://raw.githubusercontent.com/chartmuseum/charts/main/logo.jpg