k8s: bump Ingress apiVersion to v1 if capability exist (k8s 1.19+)

jupyterhub · Jan 14, 2021 · e01292c · e01292c
1 parent b8622ef
commit e01292c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/jupyterhub/templates/ingress.yaml b/jupyterhub/templates/ingress.yaml
@@ -1,8 +1,8 @@
 {{- if .Values.ingress.enabled -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-apiVersion: networking.k8s.io/v1beta1
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+apiVersion: networking.k8s.io/v1
 {{- else }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
@@ -22,9 +22,18 @@ spec:
       http:
         paths:
           - path: {{ $.Values.hub.baseUrl }}{{ $.Values.ingress.pathSuffix }}
+            {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            pathType: Prefix
+            backend:
+              service:
+                name: proxy-public
+                port:
+                  name: http
+            {{- else }}
             backend:
               serviceName: proxy-public
               servicePort: 80
+            {{- end }}
     {{- end }}
   {{- if .Values.ingress.tls }}
   tls: