Set Ingress network API version based on k8s version (#52)

Fixes #51

Author: czunker

helm/oauth2-proxy/Chart.yaml

@@ -1,35 +1,35 @@
 name: oauth2-proxy
-version: 4.2.0
+version: 4.2.1
 apiVersion: v2
 appVersion: 7.1.3
 home: https://oauth2-proxy.github.io/oauth2-proxy/
 description: A reverse proxy that provides authentication with Google, Github or other providers
 keywords:
-- kubernetes
-- oauth
-- oauth2
-- authentication
-- google
-- github
-- redis
+  - kubernetes
+  - oauth
+  - oauth2
+  - authentication
+  - google
+  - github
+  - redis
 dependencies:
   - name: redis
     version: ~10.6.0
     repository: https://charts.bitnami.com/bitnami
     alias: redis
     condition: redis.enabled
 sources:
-- https://github.com/oauth2-proxy/oauth2-proxy
-- https://github.com/oauth2-proxy/manifests
+  - https://github.com/oauth2-proxy/oauth2-proxy
+  - https://github.com/oauth2-proxy/manifests
 maintainers:
-- name: desaintmartin
-  email: [email protected]
-- name: tlawrie
-- name: NickMeves
-  email: [email protected]
-- name: JoelSpeed
-  email: [email protected]
-- name: pierluigilenoci
-  email: [email protected]
+  - name: desaintmartin
+    email: [email protected]
+  - name: tlawrie
+  - name: NickMeves
+    email: [email protected]
+  - name: JoelSpeed
+    email: [email protected]
+  - name: pierluigilenoci
+    email: [email protected]
 engine: gotpl
 kubeVersion: ">=1.9.0-0"

helm/oauth2-proxy/ci/ingress-extra-paths-values.yaml

@@ -1,9 +1,14 @@
 ingress:
+  enabled: true
+  path: /
+  pathType: ImplementationSpecific
+  hosts:
+    - chart-example.local
   extraPaths:
-  - path: /*
-    pathType: ImplementationSpecific
-    backend:
-      service:
-        name: ssl-redirect
-        port:
-          name: use-annotation
+    - path: /*
+      pathType: ImplementationSpecific
+      backend:
+        service:
+          name: ssl-redirect
+          port:
+            name: use-annotation

helm/oauth2-proxy/templates/ingress.yaml

@@ -5,10 +5,10 @@
 {{- $ingressPathType := .Values.ingress.pathType -}}
 {{- $extraPaths := .Values.ingress.extraPaths -}}
 {{- $apiV1 := false -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= v1.19.0" .Capabilities.KubeVersion.Version) -}}
 apiVersion: networking.k8s.io/v1
 {{- $apiV1 = true -}}
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" -}}
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1