Update references to Ingress annotations

Signed-off-by: davidmirror-ops <[email protected]>
flyteorg · Dec 15, 2023 · 5044e4f · 5044e4f
1 parent d0173a6
commit 5044e4f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/charts/flyte-binary/eks-production.yaml b/charts/flyte-binary/eks-production.yaml
@@ -90,15 +90,27 @@ clusterResourceTemplates:
           eks.amazonaws.com/role-arn: '{{ defaultIamRole }}'
 ingress:
   create: true
+  ##-- Uncomment the following section if you plan to use NGINX Ingress Controller
+  #ingressClassName: nginx
+  #commonAnnotations:
+  #  ingress.kubernetes.io/rewrite-target: /
+  #  nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  #httpAnnotations:
+  #  nginx.ingress.kubernetes.io/app-root: /console
+  #grpcAnnotations:
+  #  nginx.ingress.kubernetes.io/backend-protocol: GRPC
+  #host: <your-Flyte-URL> # change for the URL you'll use to connect to Flyte
+  ## ---
+
+  #This section assumes you are using the ALB Ingress controller.
+  ingressClassName: alb
   commonAnnotations:
-    #This section assumes you are using the ALB Ingress controller
     alb.ingress.kubernetes.io/certificate-arn: 'arn:aws:acm:<AWS-REGION>:<AWS-ACCOUNT-ID>:certificate/<CERTIFICATE-ID>'
     alb.ingress.kubernetes.io/group.name: flyte
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/ssl-redirect: '443'
     alb.ingress.kubernetes.io/target-type: ip
-    kubernetes.io/ingress.class: alb
   httpAnnotations:
     alb.ingress.kubernetes.io/actions.app-root: '{"Type": "redirect", "RedirectConfig": {"Path": "/console", "StatusCode": "HTTP_302"}}'
   grpcAnnotations:

diff --git a/rsts/deployment/deployment/cloud_production.rst b/rsts/deployment/deployment/cloud_production.rst
@@ -30,27 +30,14 @@ To turn on ingress, update your ``values.yaml`` file to include the following bl
       .. literalinclude:: ../../../charts/flyte-binary/eks-production.yaml
          :caption: charts/flyte-binary/eks-production.yaml
          :language: yaml
-         :lines: 127-135
+         :lines: 93-102
 
    .. group-tab:: ``flyte-binary``/ on EKS using ALB 
 
-      .. code-block:: yaml
-
-         ingress:
-           create: true
-           commonAnnotations:
-             alb.ingress.kubernetes.io/certificate-arn: '<your-SSL-certificate-ARN>'
-             alb.ingress.kubernetes.io/group.name: flyte
-             alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-             alb.ingress.kubernetes.io/scheme: internet-facing
-             alb.ingress.kubernetes.io/ssl-redirect: '443'
-             alb.ingress.kubernetes.io/target-type: ip
-             kubernetes.io/ingress.class: alb
-           httpAnnotations:
-             alb.ingress.kubernetes.io/actions.app-root: '{"Type": "redirect", "RedirectConfig": {"Path": "/console", "StatusCode": "HTTP_302"}}'
-           grpcAnnotations:
-             alb.ingress.kubernetes.io/backend-protocol-version: GRPC 
-           host: <your-URL> #use a DNS CNAME pointing to your ALB
+      .. literalinclude:: ../../../charts/flyte-binary/eks-production.yaml
+         :caption: charts/flyte-binary/eks-production.yaml
+         :language: yaml
+         :lines: 106-118
 
    .. group-tab:: ``flyte-core`` on GCP using NGINX