diff --git a/deploy/k8s/helm/apigwms/templates/ingress.yaml b/deploy/k8s/helm/apigwms/templates/ingress.yaml index bc0c6d05b..2779f6ced 100644 --- a/deploy/k8s/helm/apigwms/templates/ingress.yaml +++ b/deploy/k8s/helm/apigwms/templates/ingress.yaml @@ -1,8 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.mobileshoppingapigw -}} - -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "apigwms.fullname" . }} diff --git a/deploy/k8s/helm/apigwws/templates/ingress.yaml b/deploy/k8s/helm/apigwws/templates/ingress.yaml index 945038081..7e56bbb08 100644 --- a/deploy/k8s/helm/apigwws/templates/ingress.yaml +++ b/deploy/k8s/helm/apigwws/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.webshoppingapigw -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "apigwws.fullname" . }} diff --git a/deploy/k8s/helm/identity-api/templates/ingress-dockerk8s.yaml b/deploy/k8s/helm/identity-api/templates/ingress-dockerk8s.yaml index b6a8980f2..04f97756e 100644 --- a/deploy/k8s/helm/identity-api/templates/ingress-dockerk8s.yaml +++ b/deploy/k8s/helm/identity-api/templates/ingress-dockerk8s.yaml @@ -3,7 +3,7 @@ {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.identity }} {{- $name := include "identity-api.fullname" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ $name }}-local diff --git a/deploy/k8s/helm/identity-api/templates/ingress.yaml b/deploy/k8s/helm/identity-api/templates/ingress.yaml index 751636926..53876c999 100644 --- a/deploy/k8s/helm/identity-api/templates/ingress.yaml +++ b/deploy/k8s/helm/identity-api/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.identity }} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "identity-api.fullname" . }} diff --git a/deploy/k8s/helm/webhooks-api/templates/ingress.yaml b/deploy/k8s/helm/webhooks-api/templates/ingress.yaml index c7c096b77..3acb8a82f 100644 --- a/deploy/k8s/helm/webhooks-api/templates/ingress.yaml +++ b/deploy/k8s/helm/webhooks-api/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.webhooks }} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "webhooks-api.fullname" . }} diff --git a/deploy/k8s/helm/webhooks-web/templates/ingress.yaml b/deploy/k8s/helm/webhooks-web/templates/ingress.yaml index 1e5df8c45..47d1853a1 100644 --- a/deploy/k8s/helm/webhooks-web/templates/ingress.yaml +++ b/deploy/k8s/helm/webhooks-web/templates/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "webhooks-web.fullname" . }} diff --git a/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml b/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml index 72e043039..79d87dbea 100644 --- a/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml +++ b/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml @@ -3,7 +3,7 @@ {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.mvc }} {{- $name := include "webmvc.fullname" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ $name }}-local diff --git a/deploy/k8s/helm/webmvc/templates/ingress.yaml b/deploy/k8s/helm/webmvc/templates/ingress.yaml index 1899f5a18..2bc97738c 100644 --- a/deploy/k8s/helm/webmvc/templates/ingress.yaml +++ b/deploy/k8s/helm/webmvc/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} {{- $serviceName := .Values.app.svc.mvc -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "webmvc.fullname" . }} diff --git a/deploy/k8s/helm/webspa/templates/ingress.yaml b/deploy/k8s/helm/webspa/templates/ingress.yaml index 2b9fdd703..e26021069 100644 --- a/deploy/k8s/helm/webspa/templates/ingress.yaml +++ b/deploy/k8s/helm/webspa/templates/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "webspa.fullname" . }} diff --git a/deploy/k8s/helm/webstatus/templates/ingress.yaml b/deploy/k8s/helm/webstatus/templates/ingress.yaml index 9902b86b5..960cfa15b 100644 --- a/deploy/k8s/helm/webstatus/templates/ingress.yaml +++ b/deploy/k8s/helm/webstatus/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "webstatus.fullname" . -}} {{- $ingressPath := include "pathBase" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "webstatus.fullname" . }} diff --git a/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml b/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml index b9ecd4cba..84b650796 100644 --- a/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml +++ b/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: @@ -18,7 +18,7 @@ spec: servicePort: http path: /webmvc --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: