Merge pull request #70 from mittwald/ingressv1

update ingress to networking.k8s.io/v1
mittwald · Jul 12, 2023 · a72718f · a72718f
2 parents 99e0c5d + daae574
commit a72718f
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/deploy/helm-chart/servicegateway/templates/ingress.yaml b/deploy/helm-chart/servicegateway/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "servicegateway.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-apiVersion: {{ template "servicegateway.ingress.apiVersion" . }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -35,17 +35,20 @@ spec:
         paths:
         {{- range .paths }}
           - path: {{ . }}
+            pathType: Prefix
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              service:
+                name: {{ $fullName }}
+                port: 
+                  number: {{ $svcPort }}
         {{- end }}
   {{- end }}
 {{- end }}
 ---
 {{- $fullName := include "servicegateway.fullname" . -}}
 {{- range $ingressName, $ingress := .Values.ingresses }}
 {{- if and $ingress (or $ingress.enabled (eq ($ingress.enabled | toString) "<nil>")) }}
-apiVersion: {{ template "servicegateway.ingress.apiVersion" $ }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-{{ $ingressName }}
@@ -76,9 +79,12 @@ spec:
         paths:
         {{- range .paths }}
           - path: {{ . }}
+            pathType: Prefix
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $.Values.service.port}}
+              service:
+                name: {{ $fullName }}
+                port: 
+                  number: {{ $svcPort }}
         {{- end }}
   {{- end }}
 ---