Fixes issues gabibbo97#50 & gabibbo97#34

holmesb · Sep 13, 2021 · 2db9b01 · 2db9b01
1 parent b4e83de
commit 2db9b01
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/charts/gangway/Chart.yaml b/charts/gangway/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: gangway
-version: 1.1.0
+version: 1.2.0
 description: An application that can be used to easily enable authentication flows via OIDC for a kubernetes cluster.
 type: application
 home: https://github.com/heptiolabs/gangway

diff --git a/charts/gangway/templates/config.yaml b/charts/gangway/templates/config.yaml
@@ -90,7 +90,6 @@ metadata:
     {{- include "gangway.labels" . | nindent 4 }}
 data:
   tls.crt: {{ .Values.trustedCA.content | b64enc | quote }}
-type: kubernetes.io/tls
 {{- end }}
 {{/* Environment secrets */}}
 {{- if not .Values.existingSecret }}

diff --git a/charts/gangway/templates/ingress.yaml b/charts/gangway/templates/ingress.yaml
@@ -1,9 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "gangway.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{- if semverCompare ">=1.19.0" $.Capabilities.KubeVersion.Version }}
+apiVersion: networking.k8s.io/v1
+{{- else }}
 apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
@@ -16,6 +16,13 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.class }}
+{{- if semverCompare ">=1.19.0" $.Capabilities.KubeVersion.Version }}
+  ingressClassName: {{ .Values.ingress.class }}
+{{- else }}
+{{- fail "Please set the kubernetes.io/ingress.class annotation instead" }}
+{{- end }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}
@@ -31,11 +38,20 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- range .paths }}
+          {{- range .paths }}
           - path: {{ . }}
+          {{- if semverCompare ">=1.19.0" $.Capabilities.KubeVersion.Version }}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ include "gangway.fullname" $ }}
+                port:
+                  name: http
+          {{- else }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
         {{- end }}
   {{- end }}
+  {{- end }}
 {{- end }}