Merge pull request #131 from ibm-apiconnect/develop

Fixpack 19 updates
ibm-apiconnect · Jan 20, 2022 · 2f7cd0d · 2f7cd0d
2 parents 5238e35 + 7f8613f
commit 2f7cd0d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/stable/dynamic-gateway-service/Chart.yaml b/stable/dynamic-gateway-service/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for deploying IBM API Connect gateway to Kubernetes
 name: dynamic-gateway-service
-version: 1.0.66
+version: 1.0.67
diff --git a/stable/dynamic-gateway-service/templates/gateway-ingress.yaml b/stable/dynamic-gateway-service/templates/gateway-ingress.yaml
@@ -1,6 +1,6 @@
 {{- if eq .Values.ingressType "ingress" }}
 {{- if .Values.ingress.gateway.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "dynamic-gateway-service.fullname" . }}-gw
@@ -22,10 +22,13 @@ spec:
     - host: {{ $host.name }}
       http:
         paths:
-          - path: /
-            backend:
-              serviceName: {{ template "dynamic-gateway-service.fullname" $ }}-ingress
-              servicePort: {{ $.Values.datapower.apiGatewayLocalPort }}
+        - path: /
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ template "dynamic-gateway-service.fullname" $ }}-ingress
+              port:
+                number: {{ $.Values.datapower.apiGatewayLocalPort }}
     {{- end -}}
   {{- if .Values.ingress.gateway.enableTLS }}
   tls:

diff --git a/stable/dynamic-gateway-service/templates/gwd-ingress.yaml b/stable/dynamic-gateway-service/templates/gwd-ingress.yaml
@@ -1,6 +1,6 @@
 {{- if eq .Values.ingressType "ingress" }}
 {{- if .Values.ingress.gwd.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "dynamic-gateway-service.fullname" . }}
@@ -21,10 +21,13 @@ spec:
     - host: {{ $host.name }}
       http:
         paths:
-          - path: /
-            backend:
-              serviceName: {{ template "dynamic-gateway-service.fullname" $ }}-ingress
-              servicePort: {{ $.Values.datapower.apicGatewayServiceLocalPort }}
+        - path: /
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ template "dynamic-gateway-service.fullname" $ }}-ingress
+              port:
+                number: {{ $.Values.datapower.apicGatewayServiceLocalPort }}
     {{- end -}}
   {{- if .Values.ingress.gwd.enableTLS }}
   tls: