Adjust ingress API for Kubernetes 1.22+

aleveille · Oct 7, 2021 · a64d26b · a64d26b
1 parent fe356a6
commit a64d26b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -86,7 +86,7 @@ spec:
           - --encryption-key={{ include "idp.encryption_key" . }}
           ports:
             - name: http-sso
-              containerPort: {{ .Values.keycloakGatekeeper.proxyPort }}
+              containerPort: {{ .Values.keycloakGatekeeper.port }}
               protocol: TCP
         {{- end }}
         - name: {{ .Chart.Name }}

diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
@@ -2,9 +2,11 @@
 {{- $fullName := include "octant.fullname" . -}}
 {{- $svcPort := .Values.keycloakGatekeeper.proxyPort -}}
 
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19.x" .Capabilities.KubeVersion.Version) }}
+apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{- else }}
 apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
@@ -33,10 +35,19 @@ spec:
       http:
         paths:
         {{- range .paths }}
-          - path: {{ . }}
+          - path: {{ .path }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+            {{- else }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: http
+            {{- end }}
         {{- end }}
   {{- end }}
 {{- end }}