Updates ingress yaml manifests

2021-07-20 14:33:11 +05:30 · 2021-07-20 14:33:11 +05:30 · 8af66e7980
commit 8af66e7980
parent c8d567d8ac
10 changed files with 58 additions and 24 deletions
--- 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 }}
--- 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 }}
--- 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 }}
--- 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 }}
--- 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 }}
--- 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 -}}
--- 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 }}
--- 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 }}
--- 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 }}
--- 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