Make chart compatible with k8s 1.20+

fabianmp · Mar 7, 2022 · 1ca00eb · 1ca00eb
1 parent 62d449d
commit 1ca00eb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: taiga
 description: A Helm chart for Taiga
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: "6.4.2"
 home: https://www.taiga.io/
 sources:

diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -1,9 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "taiga.fullname" . }}
@@ -25,19 +21,31 @@ spec:
       http:
         paths:
           - path: /api
+            pathType: Prefix
             backend:
-              serviceName: {{ include "taiga.fullname" . }}
-              servicePort: {{ .Values.service.ports.backend }}
+              service:
+                name: {{ include "taiga.fullname" . }}
+                port:
+                  number: {{ .Values.service.ports.backend }}
           - path: /admin
+            pathType: Prefix
             backend:
-              serviceName: {{ include "taiga.fullname" . }}
-              servicePort: {{ .Values.service.ports.backend }}
+              service:
+                name: {{ include "taiga.fullname" . }}
+                port:
+                  number: {{ .Values.service.ports.backend }}
           - path: /events
+            pathType: Prefix
             backend:
-              serviceName: {{ include "taiga.fullname" . }}
-              servicePort: {{ .Values.service.ports.events }}
+              service:
+                name: {{ include "taiga.fullname" . }}
+                port:
+                  number: {{ .Values.service.ports.events }}
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: {{ include "taiga.fullname" . }}
-              servicePort: {{ .Values.service.ports.frontend }}
+              service:
+                name: {{ include "taiga.fullname" . }}
+                port:
+                  number: {{ .Values.service.ports.frontend }}
   {{- end }}