Upgrade ingress template

Signed-off-by: Martyn Ranyard <m@rtyn.berlin>

deploy/wkd4pgp/templates/ingress.yaml

@@ -1,41 +1,51 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "wkd4pgp.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
+{{- $version := "extensions/v1beta1" -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $version = "networking.k8s.io/v1" -}}
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $version = "networking.k8s.io/v1beta1" -}}
+{{- end -}}
+apiVersion: {{ $version }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-{{ include "wkd4pgp.labels" . | indent 4 }}
+    {{- include "wkd4pgp.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-{{- if .Values.ingress.tls }}
+  {{- if .Values.ingress.tls }}
   tls:
-  {{- range .Values.ingress.tls }}
+    {{- range .Values.ingress.tls }}
     - hosts:
-      {{- range .hosts }}
+        {{- range .hosts }}
         - {{ . | quote }}
-      {{- end }}
+        {{- end }}
       secretName: {{ .secretName }}
+    {{- end }}
   {{- end }}
-{{- end }}
   rules:
-  {{- range .Values.ingress.hosts }}
+    {{- range .Values.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- range .paths }}
-          - path: {{ . }}
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType:  {{ .pathType }}
             backend:
+              {{- if eq $version "networking.k8s.io/v1" }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else -}}
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
-        {{- end }}
+              {{- end -}}
+          {{- end }}
+    {{- end }}
   {{- end }}
-{{- end }}

deploy/wkd4pgp/values.yaml

@@ -45,10 +45,12 @@ ingress:
   hosts:
     - host: rtyn.berlin
       paths: 
-      - /.well-known/openpgpkey/
+      - path: /.well-known/openpgpkey/
+        pathType: Prefix
     - host: openpgpkey.rtyn.berlin
       paths:
-      - /.well-known/openpgpkey/
+      - path: /.well-known/openpgpkey/
+        pathType: Prefix
 
   tls:
   - secretName: chart-example-tls