From cd14397492bb9d1e113c7b99c7eb9685a4001c45 Mon Sep 17 00:00:00 2001
From: Markus Heinemann <markus-heinemann@outlook.com>
Date: Mon, 2 Aug 2021 18:23:31 +0000
Subject: [PATCH 1/2] fix(ui): update ingress api versions in helm chart for
 newer k8s versions

---
 charts/postgres-operator-ui/templates/ingress.yaml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/charts/postgres-operator-ui/templates/ingress.yaml b/charts/postgres-operator-ui/templates/ingress.yaml
index 873cfed0f..21e7dbea2 100644
--- a/charts/postgres-operator-ui/templates/ingress.yaml
+++ b/charts/postgres-operator-ui/templates/ingress.yaml
@@ -1,7 +1,10 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "postgres-operator-ui.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -37,9 +40,18 @@ spec:
         paths:
         {{- range .paths }}
           - path: {{ . }}
+            {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+            {{- else -}}
             backend:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
+            {{- end -}}
         {{- end }}
   {{- end }}
 {{- end }}

From 2a978bbab0c884988c9e781ba9eadd2a86422c74 Mon Sep 17 00:00:00 2001
From: Markus Heinemann <markus-heinemann@outlook.com>
Date: Wed, 11 Aug 2021 16:04:53 +0000
Subject: [PATCH 2/2] fix(ui): update ingress api version in plain manifest

---
 ui/manifests/ingress.yaml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/manifests/ingress.yaml b/ui/manifests/ingress.yaml
index 4efac53ac..a5e6f0fab 100644
--- a/ui/manifests/ingress.yaml
+++ b/ui/manifests/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: "networking.k8s.io/v1beta1"
+apiVersion: "networking.k8s.io/v1"
 kind: "Ingress"
 metadata:
   name: "postgres-operator-ui"
@@ -10,6 +10,10 @@ spec:
     - host: "ui.example.org"
       http:
         paths:
-          - backend:
-              serviceName: "postgres-operator-ui"
-              servicePort: 80
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: "postgres-operator-ui"
+                port:
+                  number: 80