Merge pull request #2 from spoved/app-ingress

update ingress
spoved · Jun 23, 2021 · f391e43 · f391e43
2 parents b12bffb + 480896f
commit f391e43
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/charts/app/Chart.yaml b/charts/app/Chart.yaml
@@ -5,5 +5,5 @@ maintainers:
   - name: Holden Omans
     email: [email protected]
 # Please make sure that version and appVersion are always the same.
-version: 0.1.1
-appVersion: 0.1.1
+version: 0.1.2
+appVersion: 0.1.2
diff --git a/charts/app/templates/ingress.yaml b/charts/app/templates/ingress.yaml
@@ -39,18 +39,18 @@ spec:
       http:
         paths:
         {{- range .paths }}
-          - path: {{ . }}
+          - path: {{ .path }}
             {{- if semverCompare ">=1.19-0" $k8sver }}
             pathType: ImplementationSpecific
             backend:
               service:
-                name: {{ $fullName }}
+                name: {{ default $fullName .serviceName }}
                 port:
-                  name: {{ $portName }}
+                  name: {{ default $portName .servicePort }}
             {{- else }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $portName }}
+              serviceName: {{ default $fullName .serviceName }}
+              servicePort: {{ default $portName .servicePort }}
             {{- end }}
         {{- end }}
   {{- $portName = "http" -}}

diff --git a/ct.yaml b/ct.yaml
@@ -6,3 +6,4 @@ chart-dirs:
 helm-extra-args: --timeout 600s
 chart-repos:
   - ndustrial=https://spoved.github.io/charts
+validate-maintainers: false