Merge pull request #48 from commercetools/update_api_versions

update api-versions for public services.
commercetools · Oct 7, 2022 · 09191aa · 09191aa
2 parents 8c8783f + 2aa7de4
commit 09191aa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git 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
diff --git 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,18 +31,24 @@ 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 }}
     - http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: ImplementationSpecific
             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
@@ -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
@@ -1,6 +1,6 @@
 {{- if .Values.pdb.enabled -}}
 {{- $fullName := include "public-service.fullname" . -}}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ $fullName }}