Update EKS Ingress and Instructions (#825)

* Update EKS Ingress and Instructions Signed-off-by: Haytham Abuelfutuh <[email protected]> * Move alb ingress to addons Signed-off-by: Haytham Abuelfutuh <[email protected]> * Update k8s version used in KinD Signed-off-by: Haytham Abuelfutuh <[email protected]> * delete unused file Signed-off-by: Haytham Abuelfutuh <[email protected]> * PR Comments Signed-off-by: Haytham Abuelfutuh <[email protected]> * comments Signed-off-by: Haytham Abuelfutuh <[email protected]>
flyteorg · Mar 15, 2021 · 4e0eed6 · 4e0eed6
1 parent f52921b
commit 4e0eed6
Show file tree

Hide file tree

Showing 19 changed files with 892 additions and 330 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,23 +2,25 @@ name: tests
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
 jobs:
   end-to-end:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Kustomize and diff
-      run: DELTA_CHECK=true make kustomize
-    - uses: engineerd/[email protected]
-    - name: End2End
-      env:
-        DOCKER_USERNAME: ${{ github.actor }}
-        DOCKER_PASSWORD: "${{ secrets.GITHUB_TOKEN }}"
-      run: |
-        kubectl cluster-info
-        kubectl get pods -n kube-system
-        echo "current-context:" $(kubectl config current-context)
-        echo "environment-kubeconfig:" ${KUBECONFIG}
-        make end2end_execute
+      - uses: actions/checkout@v1
+      - name: Kustomize and diff
+        run: DELTA_CHECK=true make kustomize
+      - uses: engineerd/[email protected]
+        with:
+          version: "v0.10.0"
+      - name: End2End
+        env:
+          DOCKER_USERNAME: ${{ github.actor }}
+          DOCKER_PASSWORD: "${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          kubectl cluster-info
+          kubectl get pods -n kube-system
+          echo "current-context:" $(kubectl config current-context)
+          echo "environment-kubeconfig:" ${KUBECONFIG}
+          make end2end_execute
diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -9017,45 +9017,170 @@ spec:
       restartPolicy: Never
       serviceAccountName: sparkoperator
 ---
-apiVersion: extensions/v1beta1
+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: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
     alb.ingress.kubernetes.io/tags: service_instance=production
     kubernetes.io/ingress.class: alb
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+  labels:
+    app: flyteadmin
   name: flytesystem
   namespace: flyte
 spec:
   rules:
   - http:
       paths:
       - backend:
-          serviceName: flyteconsole
-          servicePort: 80
+          service:
+            name: ssl-redirect
+            port:
+              name: use-annotation
+        path: /*
+        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
-        path: /api
+          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:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /v1/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /openapi/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /.well-known/*
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /login
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 80
-        path: /v1
+          service:
+            name: flyteadmin
+            port:
+              number: 80
+        path: /login/*
+        pathType: ImplementationSpecific
       - backend:
-          serviceName: flyteadmin
-          servicePort: 81
-        path: /flyteidl.service.AdminService
+          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
+---
+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/backend-protocol-version: GRPC
+    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: '[{"HTTPS":443}]'
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/tags: service_instance=production
+    kubernetes.io/ingress.class: alb
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+  labels:
+    app: flyteadmin
+  name: flytesystem-grpc
+  namespace: flyte
+spec:
+  rules:
+  - http:
+      paths:
       - backend:
-          serviceName: flyteadmin
-          servicePort: 87
-        path: /openapi
+          service:
+            name: flyteadmin
+            port:
+              number: 81
+        path: /flyteidl.service.AdminService/*
+        pathType: ImplementationSpecific