Merge pull request #13 from jstrachan/changes

fix: add support for Ingress v1

Author: jenkins-x-bot-test

charts/lighthouse-webui-plugin/templates/ingress.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: {{ .Values.ingress.apiVersion }}
 kind: Ingress
 metadata:
   name: {{ include "webui.fullname" . }}
@@ -21,6 +21,7 @@ metadata:
   {{- end }}
 spec:
   rules:
+{{- if eq .Values.ingress.apiVersion "networking.k8s.io/v1beta1" }}
   {{- range .Values.ingress.hosts }}
   - host: {{ tpl . $ }}
     http:
@@ -29,6 +30,20 @@ spec:
           serviceName: {{ include "webui.fullname" $ }}
           servicePort: http
   {{- end }}
+{{- else }}
+  {{- $pathType := .Values.ingress.pathType | default "ImplementationSpecific" -}}
+  {{- range .Values.ingress.hosts }}
+  - host: {{ tpl . $ }}
+    http:
+      paths:
+      - pathType: {{ $pathType }}
+        backend:
+          service:
+            name: {{ include "webui.fullname" $ }}
+            port:
+              name: http
+  {{- end }}
+{{- end }}
 
   {{- if .Values.ingress.tls.enabled }}
   tls:

charts/lighthouse-webui-plugin/values.yaml

@@ -76,6 +76,9 @@ ingress:
   labels: {}
   annotations: {}
 
+  apiVersion: "networking.k8s.io/v1beta1"
+  pathType: "ImplementationSpecific"
+
   # hosts:
   # - lighthouse.example.com
   # - lighthouse.foo.bar