numerology
diff --git a/‎content/_redirects
+22-2 b/‎content/_redirects
+22-2
diff --git a/‎content/docs/aws/authentication.md
+16-9 b/‎content/docs/aws/authentication.md
+16-9
diff --git a/‎content/docs/aws/deploy/existing-cluster.md
-47 b/‎content/docs/aws/deploy/existing-cluster.md
-47
@@ -32,7 +32,8 @@
 /docs/pipelines/install-sdk/                   /docs/pipelines/sdk/install-sdk/
 /docs/pipelines/lightweight-python-components/ /docs/pipelines/sdk/lightweight-python-components/
 /docs/pipelines/build-pipeline/                /docs/pipelines/tutorials/build-pipeline/
-/docs/pipelines/pipelines-tutorial/            /docs/pipelines/tutorials/pipelines-tutorial/
+/docs/pipelines/pipelines-tutorial/            /docs/gke/pipelines-tutorial/
+/docs/pipelines/tutorials/pipelines-tutorial/  /docs/gke/pipelines-tutorial/
 
 /docs/pipelines/metrics/                       /docs/pipelines/sdk/pipelines-metrics/
 /docs/pipelines/metrics/pipelines-metrics/     /docs/pipelines/sdk/pipelines-metrics/
@@ -41,7 +42,8 @@
 /docs/pipelines/pipelines-overview/            /docs/pipelines/overview/pipelines-overview/
 /docs/pipelines/sdk/enable-gpu-and-tpu/        /docs/pipelines/sdk/gcp/enable-gpu-and-tpu/
 /docs/pipelines/preemptible/                   /docs/pipelines/sdk/gcp/preemptible/
-/docs/pipelines/reusable-components/           /docs/pipelines/sdk/reusable-components/
+/docs/pipelines/reusable-components/           /docs/examples/shared-resources/
+/docs/pipelines/sdk/reusable-components/       /docs/examples/shared-resources/
 
 # Moved the guide to monitoring GKE deployments.
 /docs/other-guides/monitoring/                 /docs/gke/monitoring/
@@ -75,3 +77,21 @@ docs/started/requirements/                    /docs/started/getting-started/
 /docs/components/pytorchserving                /docs/components/serving/pytorchserving
 /docs/components/tfserving_new                 /docs/components/serving/tfserving_new
 
+# Restructured the getting-started and other-guides sections.
+/docs/started/getting-started-k8s/             /docs/started/k8s/
+/docs/started/getting-started-minikf/          /docs/other-guides/virtual-dev/getting-started-minikf/
+/docs/started/getting-started-minikube/        /docs/other-guides/virtual-dev/getting-started-minikube/
+/docs/started/getting-started-multipass/       /docs/other-guides/virtual-dev/getting-started-multipass/
+/docs/started/getting-started-aws/             /docs/started/cloud/getting-started-aws/
+/docs/started/getting-started-azure/           /docs/started/cloud/getting-started-azure/
+/docs/started/getting-started-gke/             /docs/started/cloud/getting-started-gke/
+/docs/started/getting-started-icp/             /docs/started/cloud/getting-started-icp/
+
+
+/docs/other-guides/job-scheduling/             /docs/use-cases/job-scheduling/
+/docs/other-guides/upgrade/                    /docs/upgrading/upgrade/
+
+/docs/use-cases/kubeflow-on-multinode-cluster/ /docs/other-guides/kubeflow-on-multinode-cluster/
+
+# Remove Kubeflow installation on existing EKS cluster
+/docs/aws/deploy/existing-cluster/             /docs/aws/deploy/install-kubeflow/
@@ -8,11 +8,11 @@ This section shows the how to add TLS support and create a user pool to authenti
 
 
 ## Traffic Flow
-External Traffic → [ Ingress → Istio ingress gateway → ambassador ]
+External Traffic → [ Ingress → Istio ingress gateway → Istio virtual services ]
 
 When you generate and apply kubernetes resources, an ingress is created to manage external traffic to Kubernetes services. The AWS Appliction Load Balancer(ALB) Ingress Controller will provision an Application Load balancer for that ingress. By default, TLS and authentication are not enabled at creation time.
 
-The Kubeflow community plans to move from [Ambassador](https://www.getambassador.io/) to [Istio](https://istio.io/) to manage internal traffic (see [this issue](https://github.com/kubeflow/kubeflow/issues/2261)). Currently, [Ambassador](https://www.getambassador.io/) still plays the role of an API gateway. TLS, authentication, and authorization either can be done at the ALB or Istio layer for the AWS platform, and we plan to have Istio forward ingress traffic to the Istio gateway and then on to Ambassador when this happens. Once receive a clear direction from the community, we will enable TLS and authentication by default.
+In Kubeflow 0.6 release, community already move from [Ambassador](https://www.getambassador.io/) to [Istio](https://istio.io/) to manage internal traffic. In AWS solution, TLS, authentication,can be done at the ALB and and authorization can be done at Istio layer.
 
 
 ## Enable TLS and Authentication
@@ -39,17 +39,24 @@ To get TLS support from the ALB Ingress Controller, you need to follow [this tut
 
 In order to authenticate and manage users for Kubeflow, let's create a user pool. You can follow these instructions here. Once a user pool created, we will have a `UserPoolId`, a Cognito Domain name, and a Cognito Pool Arn.
 
-Before you apply k8s, you can go into ${KUBEFLOW_SRC}/${KFAPP}/ks_app,
+Before you `generate all -V`, please update Cognito spec in `app.yaml` like this,
 
 ```
-ks param set istio-ingress CognitoUserPoolArn arn:aws:cognito-idp:us-west-2:xxx:userpool/xxx
-ks param set istio-ingress CognitoAppClientId xxxxxx
-ks param set istio-ingress CognitoUserPoolDomain xxxx
-ks param set istio-ingress enableCognito true
-ks param set istio-ingress certArn arn:aws:acm:us-west-2:xxx:certificate/xxxe4031c
+plugins:
+    - name: aws
+      spec:
+        auth:
+          cognito:
+            cognitoUserPoolArn: arn:aws:cognito-idp:us-west-2:xxxxx:userpool/us-west-2_xxxxxx
+            cognitoAppClientId: xxxxxbxxxxxx
+            cognitoUserPoolDomain: your-user-pool
+            certArn: arn:aws:acm:us-west-2:xxxxx:certificate/xxxxxxxxxxxxx-xxxx
+        roles:
+          - eksctl-kubeflow-aws-nodegroup-ng-a2-NodeInstanceRole-xxxxx
+        region: us-west-2
 ```
 
-After you finish the TLS and Authentication configuration, then you can run `${KUBEFLOW_SRC}/${KFAPP}/scripts/kfctl.sh apply k8s`.
+After you finish the TLS and Authentication configuration, then you can run `kfctl generate all -V`.
 
 After your ingress DNS is ready, you need to create a `CNAME` in your DNS records.