From b84cc037c159a94645da5a166344f9dbe8ef90a7 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 1 Dec 2021 09:42:01 +0100
Subject: [PATCH] Support k8s >= 1.22 ingress API

See https://github.com/wekan/charts/pull/1
---
 .gitignore                        |  1 +
 helm/wekan/charts/.gitkeep        |  1 -
 helm/wekan/templates/ingress.yaml | 13 +++++++------
 helm/wekan/values.yaml            |  3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 helm/wekan/charts/.gitkeep

diff --git a/.gitignore b/.gitignore
index 0d8901ffb..e30d6282f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ ehthumbs.db
 # Helm chart
 # Chart dependencies
 /helm/wekan/**/*.tgz
+/helm/wekan/charts
diff --git a/helm/wekan/charts/.gitkeep b/helm/wekan/charts/.gitkeep
deleted file mode 100644
index 8b1378917..000000000
--- a/helm/wekan/charts/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/helm/wekan/templates/ingress.yaml b/helm/wekan/templates/ingress.yaml
index 6904cdfa7..67ef37d32 100644
--- a/helm/wekan/templates/ingress.yaml
+++ b/helm/wekan/templates/ingress.yaml
@@ -2,7 +2,8 @@
 {{- $fullName := include "wekan.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+{{- $ingressPathType := .Values.ingress.pathtype -}}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -27,17 +28,17 @@ spec:
       secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
-  backend:
-    serviceName: {{ $fullName }}
-    servicePort: 8080
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: 8080
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: 8080
   {{- end }}
 {{- end }}
diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml
index 5fc9be2ef..0aea1215b 100644
--- a/helm/wekan/values.yaml
+++ b/helm/wekan/values.yaml
@@ -14,7 +14,7 @@ serviceAccounts:
 ##
 image:
   repository: quay.io/wekan/wekan
-  tag: v5.83
+  tag: v5.65
   pullPolicy: IfNotPresent
 
 ## Configuration for wekan component
@@ -56,6 +56,7 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   path: /*
+  pathtype: ImplementationSpecific
   # This must match 'endpoint', unless your client supports different
   # hostnames.
   hosts: [ wekan.local ]