From 8af66e798010bcec0c1d0b69327fe7623255a38d Mon Sep 17 00:00:00 2001 From: Sumit Ghosh <13281246+sughosneo@users.noreply.github.com> Date: Tue, 20 Jul 2021 14:33:11 +0530 Subject: [PATCH] Updates ingress yaml manifests --- deploy/k8s/helm/apigwms/templates/ingress.yaml | 7 +++++-- deploy/k8s/helm/apigwws/templates/ingress.yaml | 7 +++++-- deploy/k8s/helm/identity-api/templates/ingress.yaml | 7 +++++-- deploy/k8s/helm/webhooks-api/templates/ingress.yaml | 7 +++++-- deploy/k8s/helm/webhooks-web/templates/ingress.yaml | 9 +++++++-- .../k8s/helm/webmvc/templates/ingress-dockerk8s.yaml | 12 ++++++++---- deploy/k8s/helm/webmvc/templates/ingress.yaml | 7 +++++-- deploy/k8s/helm/webspa/templates/ingress.yaml | 9 +++++++-- deploy/k8s/helm/webstatus/templates/ingress.yaml | 9 +++++++-- deploy/k8s/nginx-ingress/mandatory.yaml | 8 ++++---- 10 files changed, 58 insertions(+), 24 deletions(-) diff --git a/deploy/k8s/helm/apigwms/templates/ingress.yaml b/deploy/k8s/helm/apigwms/templates/ingress.yaml index 17d10ae53..2c1e95d1b 100644 --- a/deploy/k8s/helm/apigwms/templates/ingress.yaml +++ b/deploy/k8s/helm/apigwms/templates/ingress.yaml @@ -40,8 +40,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $serviceName }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/apigwws/templates/ingress.yaml b/deploy/k8s/helm/apigwws/templates/ingress.yaml index 77452c093..d6bbb8d4c 100644 --- a/deploy/k8s/helm/apigwws/templates/ingress.yaml +++ b/deploy/k8s/helm/apigwws/templates/ingress.yaml @@ -39,8 +39,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $serviceName }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/identity-api/templates/ingress.yaml b/deploy/k8s/helm/identity-api/templates/ingress.yaml index 0bbc2bf7d..468592658 100644 --- a/deploy/k8s/helm/identity-api/templates/ingress.yaml +++ b/deploy/k8s/helm/identity-api/templates/ingress.yaml @@ -39,8 +39,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $serviceName }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/webhooks-api/templates/ingress.yaml b/deploy/k8s/helm/webhooks-api/templates/ingress.yaml index ca40fddc8..32effa98e 100644 --- a/deploy/k8s/helm/webhooks-api/templates/ingress.yaml +++ b/deploy/k8s/helm/webhooks-api/templates/ingress.yaml @@ -39,8 +39,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $serviceName }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/webhooks-web/templates/ingress.yaml b/deploy/k8s/helm/webhooks-web/templates/ingress.yaml index 6173ee4da..a2644add1 100644 --- a/deploy/k8s/helm/webhooks-web/templates/ingress.yaml +++ b/deploy/k8s/helm/webhooks-web/templates/ingress.yaml @@ -1,5 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} +{{- $serviceName := $.Values.app.svc.webhooksweb -}} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -38,8 +40,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $.Values.app.svc.webhooksweb }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml b/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml index abeda19e8..074da7e88 100644 --- a/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml +++ b/deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml @@ -25,9 +25,13 @@ spec: rules: - http: paths: - - backend: - serviceName: {{ $serviceName }} - servicePort: http - path: {{ $ingressPath }} + - path: {{ $ingressPath }} + pathType: Prefix + backend: + service: + name: {{ $serviceName }} + port: + number: 80 + {{- end -}} {{- end -}} \ No newline at end of file diff --git a/deploy/k8s/helm/webmvc/templates/ingress.yaml b/deploy/k8s/helm/webmvc/templates/ingress.yaml index 10d471c85..2e5b49a89 100644 --- a/deploy/k8s/helm/webmvc/templates/ingress.yaml +++ b/deploy/k8s/helm/webmvc/templates/ingress.yaml @@ -39,8 +39,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $serviceName }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/webspa/templates/ingress.yaml b/deploy/k8s/helm/webspa/templates/ingress.yaml index 296f40495..b684f4898 100644 --- a/deploy/k8s/helm/webspa/templates/ingress.yaml +++ b/deploy/k8s/helm/webspa/templates/ingress.yaml @@ -1,5 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $ingressPath := include "pathBase" . -}} +{{- $serviceName := $.Values.app.svc.spa -}} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -38,8 +40,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $.Values.app.svc.spa }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/helm/webstatus/templates/ingress.yaml b/deploy/k8s/helm/webstatus/templates/ingress.yaml index 9376984ef..6ec79d0dd 100644 --- a/deploy/k8s/helm/webstatus/templates/ingress.yaml +++ b/deploy/k8s/helm/webstatus/templates/ingress.yaml @@ -1,6 +1,8 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "webstatus.fullname" . -}} {{- $ingressPath := include "pathBase" . -}} +{{- $serviceName := $.Values.app.svc.status -}} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,8 +41,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: Prefix backend: - serviceName: {{ $.Values.app.svc.status }} - servicePort: http + service: + name: {{ $serviceName }} + port: + number: 80 {{- end }} {{- end }} diff --git a/deploy/k8s/nginx-ingress/mandatory.yaml b/deploy/k8s/nginx-ingress/mandatory.yaml index 2e63edd59..8fd74f681 100644 --- a/deploy/k8s/nginx-ingress/mandatory.yaml +++ b/deploy/k8s/nginx-ingress/mandatory.yaml @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/part-of: ingress-nginx --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: nginx-ingress-clusterrole @@ -82,7 +82,7 @@ rules: - update --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: nginx-ingress-role @@ -127,7 +127,7 @@ rules: - get --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: nginx-ingress-role-nisa-binding @@ -145,7 +145,7 @@ subjects: namespace: ingress-nginx --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: nginx-ingress-clusterrole-nisa-binding