From 47dc0a9aee78b3372dd104c5b930ff15b980fa2f Mon Sep 17 00:00:00 2001
From: Markus Heinemann <markus-heinemann@outlook.com>
Date: Thu, 12 Aug 2021 11:52:32 +0200
Subject: [PATCH] =?UTF-8?q?fix(ui):=20update=20ingress=20api=20versions=20?=
 =?UTF-8?q?in=20helm=20chart=20for=20newer=20k8s=20vers=E2=80=A6=20(#1575)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(ui): update ingress api versions in helm chart for newer k8s versions
* fix(ui): update ingress api version in plain manifest
---
 charts/postgres-operator-ui/templates/ingress.yaml | 14 +++++++++++++-
 ui/manifests/ingress.yaml                          | 12 ++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

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 }}
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