Merge pull request #3 from neighborhoods/swap-to-nginx-ingress

Fix $serviceName being null
neighborhoods · Jun 24, 2024 · c7e20e5 · c7e20e5
2 parents 555daea + ae73b68
commit c7e20e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/charts/neighborhoods-apps/CHANGELOG.md b/charts/neighborhoods-apps/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog
+## 2.14.1
+- Fix $serviceName being null
 ## 2.14.0
 - Swap from ALB to NGINX ingress
 ## 2.13.0

diff --git a/charts/neighborhoods-apps/Chart.yaml b/charts/neighborhoods-apps/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Neighborhoods standard chart setup with Nginx fronting the HTTP deployment
 name: neighborhoods-app
-version: 2.14.0
+version: 2.14.1
 kubeVersion: ">=1.23.0-0"
 home: https://github.com/neighborhoods/neighborhoods-chart
 sources:

diff --git a/charts/neighborhoods-apps/templates/http-ingress.yaml b/charts/neighborhoods-apps/templates/http-ingress.yaml
@@ -24,7 +24,7 @@ spec:
   - pathType: {{ .Values.ingress.pathType | default "Prefix" | quote }}
     backend:
       service:
-        name: {{ $serviceName | quote }}
+        name: {{ .Values.service.name }}
         port:
           number: {{ $servicePort }}
 {{- end }}
@@ -36,7 +36,7 @@ spec:
         pathType: {{ .Values.ingress.pathType | default "Prefix" | quote }}
         backend:
           service:
-            name: {{ $serviceName | quote }}
+            name: {{ .Values.service.name }}
             port:
               number: {{ $servicePort }}
 {{- range .Values.ingress.extraHosts }}
@@ -49,12 +49,12 @@ spec:
         pathType: {{ .Values.ingress.pathType | default "Prefix" | quote }}
       - backend:
           service:
-            name: {{ $serviceName | quote }}
+            name: {{ .Values.service.name }}
             port:
               number: {{ $servicePort }}
 {{- end }}
   tls:
     - hosts:
         - {{ required ".Values.ingress.host must be specified when .Values.ingress.enabled is true" .Values.ingress.host | quote }}
-      secretName: {{ $serviceName | quote }}
+      secretName: {{ .Values.service.name }}
 {{ end }}