Move alb ingress to addons

Signed-off-by: Haytham Abuelfutuh <[email protected]>
flyteorg · Mar 15, 2021 · ec61a64 · ec61a64
1 parent 7d44e62
commit ec61a64
Show file tree

Hide file tree

Showing 18 changed files with 652 additions and 442 deletions.
diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -9017,52 +9017,12 @@ spec:
       restartPolicy: Never
       serviceAccountName: sparkoperator
 ---
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-  name: flytesystem
-  namespace: flyte
-spec:
-  rules:
-  - http:
-      paths:
-      - backend:
-          serviceName: flyteconsole
-          servicePort: 80
-        path: /console
-      - backend:
-          serviceName: flyteconsole
-          servicePort: 80
-        path: /__webpack_hmr
-      - backend:
-          serviceName: flyteadmin
-          servicePort: 80
-        path: /api
-      - backend:
-          serviceName: flyteadmin
-          servicePort: 80
-        path: /healthcheck
-      - backend:
-          serviceName: flyteadmin
-          servicePort: 80
-        path: /v1
-      - backend:
-          serviceName: flyteadmin
-          servicePort: 81
-        path: /flyteidl.service.AdminService
-      - backend:
-          serviceName: flyteadmin
-          servicePort: 87
-        path: /openapi
----
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
     alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
-    alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:590375264460:certificate/e2f04275-2dff-4118-a493-ed3ec8f41605
+    alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:111111111111:certificate/e92fefd8-6197-4249-a524-431d611c9af6
     alb.ingress.kubernetes.io/group.name: flytesystem
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
     alb.ingress.kubernetes.io/scheme: internet-facing
@@ -9202,9 +9162,9 @@ metadata:
   annotations:
     alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
     alb.ingress.kubernetes.io/backend-protocol-version: GRPC
-    alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:590375264460:certificate/e2f04275-2dff-4118-a493-ed3ec8f41605
+    alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:111111111111:certificate/e92fefd8-6197-4249-a524-431d611c9af6
     alb.ingress.kubernetes.io/group.name: flytesystem
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/tags: service_instance=production
     kubernetes.io/ingress.class: alb
@@ -9217,13 +9177,6 @@ spec:
   rules:
   - http:
       paths:
-      - backend:
-          service:
-            name: ssl-redirect
-            port:
-              name: ssl-redirect
-        path: /*
-        pathType: ImplementationSpecific
       - backend:
           service:
             name: flyteadmin

diff --git a/deployment/gcp/flyte_generated.yaml b/deployment/gcp/flyte_generated.yaml
@@ -9049,7 +9049,7 @@ spec:
       restartPolicy: Never
       serviceAccountName: sparkoperator
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -9061,30 +9061,142 @@ spec:
   - http:
       paths:
       - backend:
-          serviceName: flyteconsole
-          servicePort: 80
+          service:
+            name: flyteconsole
+            port:
+              number: 80
+        path: /__webpack_hmr
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 81
+        path: /flyteidl.service.AdminService
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 87
+        path: /openapi
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteconsole
+            port:
+              number: 80
         path: /console
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteconsole
-          servicePort: 80
-        path: /__webpack_hmr
+          service:
+            name: flyteconsole
+            port:
+              number: 80
+        path: /console/*
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 80
+          service:
+            name: flyteadmin
+            port:
+              number: 80
         path: /api
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /api/*
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 80
+          service:
+            name: flyteadmin
+            port:
+              number: 80
         path: /healthcheck
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 80
-        path: /v1
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /v1/*
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 81
-        path: /flyteidl.service.AdminService
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /openapi/*
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 87
-        path: /openapi
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /.well-known/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /login
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /login/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /logout
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /logout/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /callback
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /callback/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /me
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /config
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /config/*
+        pathType: ImplementationSpecific