From 59a3c99feccb378f6231c8b20f8bf85875f6cb4c Mon Sep 17 00:00:00 2001
From: andreas Halberkamp <andreas.halberkamp@commercetools.de>
Date: Thu, 6 Oct 2022 16:40:35 +0200
Subject: [PATCH 1/3] update api-versions for public services.

---
 charts/public-service/templates/ingress.yaml      | 15 ++++++++++-----
 .../templates/managedCertificate.yaml             |  2 +-
 .../templates/poddisruptionbudgets.yaml           |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/charts/public-service/templates/ingress.yaml b/charts/public-service/templates/ingress.yaml
index a0031d9..533fb8b 100644
--- a/charts/public-service/templates/ingress.yaml
+++ b/charts/public-service/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "public-service.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,9 +31,12 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: ImplementationSpecific
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: service-port
+              service:
+                name: {{ $fullName }}
+                port: 
+                  name: service-port
   {{- end }}
   # If no hosts are defined, a default path for the backend mapping has to be defined
   {{- if not  .Values.ingress.hosts }}
@@ -41,8 +44,10 @@ spec:
         paths:
           - path: {{ $ingressPath }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: service-port
+              service:
+                name: {{ $fullName }}
+                port: 
+                  name: service-port
 
 {{- end }}
 {{- end }}
diff --git a/charts/public-service/templates/managedCertificate.yaml b/charts/public-service/templates/managedCertificate.yaml
index 9d8ee4c..3e8676a 100644
--- a/charts/public-service/templates/managedCertificate.yaml
+++ b/charts/public-service/templates/managedCertificate.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.managecertificate.enabled -}}
-apiVersion: networking.gke.io/v1beta2
+apiVersion: networking.gke.io/v1
 kind: ManagedCertificate
 metadata:
   name: {{ .Values.managecertificate.name }}
diff --git a/charts/public-service/templates/poddisruptionbudgets.yaml b/charts/public-service/templates/poddisruptionbudgets.yaml
index 9752f3e..35d13b9 100644
--- a/charts/public-service/templates/poddisruptionbudgets.yaml
+++ b/charts/public-service/templates/poddisruptionbudgets.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.pdb.enabled -}}
 {{- $fullName := include "public-service.fullname" . -}}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ $fullName }}

From 954ae0455178824f52a5fe03495da741b28f5de1 Mon Sep 17 00:00:00 2001
From: andreas Halberkamp <andreas.halberkamp@commercetools.de>
Date: Thu, 6 Oct 2022 16:47:26 +0200
Subject: [PATCH 2/3] Update chart version.

---
 charts/public-service/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/public-service/Chart.yaml b/charts/public-service/Chart.yaml
index ed2bcbc..c8dda34 100644
--- a/charts/public-service/Chart.yaml
+++ b/charts/public-service/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 name: public-service
 description: Helm chart for deploying an instance of a publicly available service on a K8s cluster (via HTTP from outside the cluster).
-version: 1.0.11
+version: 1.1.0

From 2aa7de4f48c9c4b87656787097d31b7c4d399f53 Mon Sep 17 00:00:00 2001
From: andreas Halberkamp <andreas.halberkamp@commercetools.de>
Date: Fri, 7 Oct 2022 09:37:55 +0200
Subject: [PATCH 3/3] Add missing pathtype.

---
 charts/public-service/templates/ingress.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/public-service/templates/ingress.yaml b/charts/public-service/templates/ingress.yaml
index 533fb8b..f284386 100644
--- a/charts/public-service/templates/ingress.yaml
+++ b/charts/public-service/templates/ingress.yaml
@@ -43,6 +43,7 @@ spec:
     - http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ $fullName }}