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

remove broken variables
neighborhoods · Jun 24, 2024 · f01b5c4 · f01b5c4
2 parents c7e20e5 + be3ee91
commit f01b5c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/charts/neighborhoods-apps/CHANGELOG.md b/charts/neighborhoods-apps/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog
+## 2.14.2
+- remove broken variables
 ## 2.14.1
 - Fix $serviceName being null
 ## 2.14.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.1
+version: 2.14.2
 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
@@ -1,7 +1,4 @@
 {{ if .Values.ingress.enabled }}
-{{- $defaultServiceName := include "standard-app.v1.default-service-name" . -}}
-{{- $serviceName := default $defaultServiceName .Values.service.name -}}
-{{- $servicePort := .Values.service.port -}}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -26,7 +23,7 @@ spec:
       service:
         name: {{ .Values.service.name }}
         port:
-          number: {{ $servicePort }}
+          number: {{ .Values.service.port }}
 {{- end }}
   rules:
   - host: {{ required ".Values.ingress.host must be specified when .Values.ingress.enabled is true" .Values.ingress.host | quote }}
@@ -38,7 +35,7 @@ spec:
           service:
             name: {{ .Values.service.name }}
             port:
-              number: {{ $servicePort }}
+              number: {{ .Values.service.port }}
 {{- range .Values.ingress.extraHosts }}
   - host: {{ . | quote }}
     http:
@@ -51,7 +48,7 @@ spec:
           service:
             name: {{ .Values.service.name }}
             port:
-              number: {{ $servicePort }}
+              number: {{ .Values.service.port }}
 {{- end }}
   tls:
     - hosts: