From 232fd15ae22ac23b5b9c02c7bb8d13fd882b9bb0 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Thu, 27 May 2021 21:05:43 -0700
Subject: [PATCH 01/12] Initial docs for AKS V2 provisioning features

---
 .../aks-config-reference/_index.md            | 96 +++++++++++++++++++
 .../hosted-kubernetes-clusters/aks/_index.md  | 80 ++++++++--------
 2 files changed, 134 insertions(+), 42 deletions(-)
 create mode 100644 content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
new file mode 100644
index 00000000000..75f3f56d79b
--- /dev/null
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -0,0 +1,96 @@
+---
+title: AKS Cluster Configuration Reference
+weight: 4
+---
+
+### Changes in v2.6
+
+- Support for node pools
+- Support for private clusters
+- Enabled autoscaling node pools
+- The AKS permissions are now configured in cloud credentials
+- For networking, a new field was added in the UI: Support Private Kubernetes Service
+
+### HTTP Application
+
+This feature allows you to set up an ingress controller in Azure.
+
+### Account Access
+
+Complete each drop-down and field using the information obtained for your IAM policy.
+
+| Setting    | Description       |
+| ---------- | -------------------------------------------------------------------------------------------------------------------- |
+| Region     | From the drop-down choose the geographical region in which to build your cluster.                                    |
+| Cloud Credentials | Select the cloud credentials that you created for your IAM policy. For more information on creating cloud credentials in Rancher, refer to [this page.]({{<baseurl>}}/rancher/v2.x/en/user-settings/cloud-credentials/) |
+
+[Microsoft Documentation: How to create and use an SSH public and private key pair](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/mac-create-ssh-keys)
+
+# OLD
+
+1. Use your subscription ID, tenant ID, app ID, and client secret to give your cluster access to AKS. If you don't have all of that information, you can retrieve it using these instructions:
+  - **App ID and tenant ID:** To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page. 
+  - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.** 
+  - **Subscription ID:** You can get the subscription ID is available in the portal from **All services > Subscriptions.**
+
+
+# NEW
+
+# Cloud Credentials
+
+### Subscription
+
+### Tenant
+
+It's possible to have multiple Tenants under an Azure Subscription.
+
+# Node Options
+
+Node Options need to have these two options added: VM Sizes and Node Count, which then tie into Availability Zones (AZ).
+
+Not all regions have support for AZs. 
+
+### Node Autoscaler
+
+# Node Pools
+
+The Azure interface allows users to specify whether a Primary Node Pool relies on either `system` (normally used for control planes) and `user` (what is most typically needed for Rancher).
+
+For Primary Node Pools, you can specify Mode, OS, Count and Size.
+
+For subsequent node pools, the Rancher UI forces the default of user.
+
+### agentpools
+
+### Node Count
+There are maximums tied to subscriptions we need to warn about.
+
+### OS
+
+Linux and Windows pools aren't interchangeable (or cross-accessible)
+
+### OS Disk Size
+
+OS Disk Size: not exposed in the API?
+
+### Maximum Pods per Node
+
+Maximum pods per node defaults to 110 with a maximum of 250.
+
+# Networking
+
+Can adopt HTTP App Routing.
+
+### Security
+ along with section for Security with a new field: Support Private Kubernetes Service Support.
+
+### Load Balancing
+
+There are two choices: Standard and Basic. Some are specific to regions and AZs. We default to Standard because Basic has fewer options and may be deprecated soon.
+
+# Private and Public Clusters
+
+There are questions about whether private nodes are in fact public.
+
+
+
diff --git a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
index 0d20d5f62b3..28b436722cf 100644
--- a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
+++ b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
@@ -8,7 +8,17 @@ aliases:
 
 You can use Rancher to create a cluster hosted in Microsoft Azure Kubernetes Service (AKS).
 
-## Prerequisites in Microsoft Azure
+- [Prerequisites in Microsoft Azure](#prerequisites-in-microsoft-azure)
+- [Setting Up the Service Principal with the Azure Command Line Tool](#setting-up-the-service-principal-with-the-azure-command-line-tool)
+  - [Setting Up the Service Principal from the Azure Portal](#setting-up-the-service-principal-from-the-azure-portal)
+- [1. Create the AKS Cloud Credentials](#1-create-the-aks-cloud-credentials)
+- [2. Create the AKS Cluster](#2-create-the-aks-cluster)
+- [Role-based Access Control](#role-based-access-control)
+- [AKS Cluster Configuration Reference](#aks-cluster-configuration-reference)
+- [Minimum AKS Permissions](#minimum-aks-permissions)
+- [Syncing](#syncing)
+
+# Prerequisites in Microsoft Azure
 
 >**Note**
 >Deploying to AKS will incur charges.
@@ -70,23 +80,14 @@ You can also follow these instructions to set up a service principal and give it
 1. Go to the Microsoft Azure Portal [home page](https://portal.azure.com).
 
 1. Click **Azure Active Directory.**
-
 1. Click **App registrations.**
-
 1. Click **New registration.**
-
 1. Enter a name. This will be the name of your service principal.
-
 1. Optional: Choose which accounts can use the service principal.
-
 1. Click **Register.**
-
 1. You should now see the name of your service principal under **Azure Active Directory > App registrations.** 
-
 1. Click the name of your service principal. Take note of the tenant ID and application ID (also called app ID or client ID) so that you can use it when provisioning your AKS cluster. Then click **Certificates & secrets.**
-
 1. Click **New client secret.**
-
 1. Enter a short description, pick an expiration time, and click **Add.** Take note of the client secret so that you can use it when provisioning the AKS cluster.
 
 **Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations.** You still need to give the service principal access to AKS. 
@@ -94,54 +95,34 @@ You can also follow these instructions to set up a service principal and give it
 To give role-based access to your service principal,
 
 1. Click **All Services** in the left navigation bar. Then click **Subscriptions.**
-
 1. Click the name of the subscription that you want to associate with your Kubernetes cluster. Take note of the subscription ID so that you can use it when provisioning your AKS cluster.
-
 1. Click **Access Control (IAM).**
-
 1. In the **Add role assignment** section, click **Add.**
-
 1. In the **Role** field, select a role that will have access to AKS. For example, you can use the **Contributor** role, which has permission to manage everything except for giving access to other users.
-
 1. In the **Assign access to** field, select **Azure AD user, group, or service principal.**
-
 1. In the **Select** field, select the name of your service principal and click **Save.**
 
 **Result:** Your service principal now has access to AKS.
 
+# 1. Create the AKS Cloud Credentials
 
-## Create the AKS Cluster
+1. From the **Cluster Management** global app, click **Cloud Credentials.**
+1. Click **Create.**
+1. Click **Azure AKS.**
+1. Fill out the form. For help with filling out the form, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference)
+
+# 2. Create the AKS Cluster
 
 Use Rancher to set up and configure your Kubernetes cluster.
 
-1. From the **Clusters** page, click **Add Cluster**.
-
-1. Choose **Azure Kubernetes Service**.
-
+1. From the **Cluster Management** global app, click **Clusters.**
+1. Click **Create.**
+1. Choose **Azure AKS**.
 1. Enter a **Cluster Name**.
-
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
+1. Fill out the form. For help with filling out the form, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference)
 
-1. Use your subscription ID, tenant ID, app ID, and client secret to give your cluster access to AKS. If you don't have all of that information, you can retrieve it using these instructions:
-  - **App ID and tenant ID:** To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page. 
-  - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.** 
-  - **Subscription ID:** You can get the subscription ID is available in the portal from **All services > Subscriptions.**
-
-1. Use **Cluster Options** to choose the version of Kubernetes, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options.**
-
-1. Complete the **Account Access** form using the output from your Service Principal. This information is used to authenticate with Azure.
-
-1. Use **Nodes** to provision each node in your cluster and choose a geographical region.
-
-	[Microsoft Documentation: How to create and use an SSH public and private key pair](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/mac-create-ssh-keys)
-<br/>
-1. Click **Create**.
-<br/>
-1. Review your options to confirm they're correct. Then click **Create**.
-
-**Result:** 
-
-Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
+**Result:** Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
 
 You can access your cluster after its state is updated to **Active.**
 
@@ -149,3 +130,18 @@ You can access your cluster after its state is updated to **Active.**
 
 - `Default`, containing the `default` namespace
 - `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
+
+# Role-based Access Control
+Upon registering or importing a cluster won't work without RBAC enabled.
+
+# AKS Cluster Configuration Reference
+
+For more information about how to configure AKS clusters from the Rancher UI, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference)
+
+
+
+# Syncing
+
+The GKE provisioner can synchronize the state of a GKE cluster between Rancher and the provider. For an in-depth technical explanation of how this works, see [Syncing.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/syncing)
+
+For information on configuring the refresh interval, see [this section.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/gke-config-reference/#configuring-the-refresh-interval)
\ No newline at end of file

From a8e3495f992de9741463dc0fc48e319db57d36c6 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Thu, 27 May 2021 21:11:41 -0700
Subject: [PATCH 02/12] Update cluster management capabilities table for AKS V2

---
 .../aks-config-reference/_index.md            |  3 +-
 .../cluster-capabilities-table/index.md       | 38 +++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index 75f3f56d79b..c06bc4891fa 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -10,6 +10,7 @@ weight: 4
 - Enabled autoscaling node pools
 - The AKS permissions are now configured in cloud credentials
 - For networking, a new field was added in the UI: Support Private Kubernetes Service
+- Windows support was removed
 
 ### HTTP Application
 
@@ -92,5 +93,5 @@ There are two choices: Standard and Basic. Some are specific to regions and AZs.
 
 There are questions about whether private nodes are in fact public.
 
-
+# Advanced Options
 
diff --git a/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md b/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md
index c123229be0c..3d2d1f88a5e 100644
--- a/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md
+++ b/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md
@@ -2,27 +2,27 @@
 headless: true
 ---
 
-| Action | Rancher Launched Kubernetes Clusters |  EKS and GKE Clusters* | Other Hosted Kubernetes Clusters | Non-EKS or GKE Registered Clusters |
+
+| Action | Rancher Launched Kubernetes Clusters |  EKS, GKE and AKS Clusters* | Other Hosted Kubernetes Clusters | Non-EKS or GKE Registered Clusters |
 | --- | --- | ---| ---|----|
-| [Using kubectl and a kubeconfig file to Access a Cluster]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cluster-access/kubectl/) | ✓ | ✓ | ✓ | ✓ |
-| [Managing Cluster Members]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cluster-access/cluster-members/) | ✓ | ✓ | ✓ | ✓ |
-| [Editing and Upgrading Clusters]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/) | ✓ | ✓ | ✓ | ** |
-| [Managing Nodes]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/nodes) | ✓ | ✓ | ✓ | ✓ *** |
-| [Managing Persistent Volumes and Storage Classes]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/volumes-and-storage/) | ✓ | ✓ | ✓ | ✓ |
-| [Managing Projects, Namespaces and Workloads]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/projects-and-namespaces/) | ✓ | ✓ | ✓ | ✓ |
-| [Using App Catalogs]({{<baseurl>}}/rancher/v2.6/en/catalog/) | ✓ | ✓ | ✓ | ✓ |
-| [Configuring Tools (Alerts, Notifiers, Logging, Monitoring, Istio)]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/tools/) | ✓ | ✓ | ✓ | ✓ |
-| [Running Security Scans]({{<baseurl>}}/rancher/v2.6/en/security/security-scan/) | ✓ | ✓ | ✓ | ✓ |
-| [Cloning Clusters]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cloning-clusters/)| ✓ | ✓ |✓ | |
-| [Ability to rotate certificates]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/certificate-rotation/) | ✓ | ✓  |  | |
-| [Ability to back up your Kubernetes Clusters]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/backing-up-etcd/) | ✓ | ✓ |  | |
-| [Ability to recover and restore etcd]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/restoring-etcd/) | ✓ |  ✓ |  | |
-| [Cleaning Kubernetes components when clusters are no longer reachable from Rancher]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cleaning-cluster-nodes/) | ✓ | | | |
-| [Configuring Pod Security Policies]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/pod-security-policy/) | ✓ | ✓ |  ||
+| [Using kubectl and a kubeconfig file to Access a Cluster]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cluster-access/kubectl/) | ✓ | ✓ | ✓ | ✓ |
+| [Managing Cluster Members]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cluster-access/cluster-members/) | ✓ | ✓ | ✓ | ✓ |
+| [Editing and Upgrading Clusters]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/editing-clusters/) | ✓ | ✓ | ✓ | ** |
+| [Managing Nodes]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/nodes) | ✓ | ✓ | ✓ | ✓ *** |
+| [Managing Persistent Volumes and Storage Classes]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/volumes-and-storage/) | ✓ | ✓ | ✓ | ✓ |
+| [Managing Projects, Namespaces and Workloads]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/projects-and-namespaces/) | ✓ | ✓ | ✓ | ✓ |
+| [Using App Catalogs]({{<baseurl>}}/rancher/v2.5/en/catalog/) | ✓ | ✓ | ✓ | ✓ |
+| [Configuring Tools (Alerts, Notifiers, Logging, Monitoring, Istio)]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/tools/) | ✓ | ✓ | ✓ | ✓ |
+| [Running Security Scans]({{<baseurl>}}/rancher/v2.5/en/security/security-scan/) | ✓ | ✓ | ✓ | ✓ |
+| [Cloning Clusters]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cloning-clusters/)| ✓ | ✓ |✓ | |
+| [Ability to rotate certificates]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/certificate-rotation/) | ✓ | ✓  |  | |
+| [Ability to back up your Kubernetes Clusters]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/backing-up-etcd/) | ✓ | ✓ |  | |
+| [Ability to recover and restore etcd]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/restoring-etcd/) | ✓ |  ✓ |  | |
+| [Cleaning Kubernetes components when clusters are no longer reachable from Rancher]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cleaning-cluster-nodes/) | ✓ | | | |
+| [Configuring Pod Security Policies]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/pod-security-policy/) | ✓ | ✓ |  ||
 
-\* Registered GKE and EKS clusters have the same options available as GKE and EKS clusters created from the Rancher UI. The  difference is that when a registered cluster is deleted from the Rancher UI, [it is not destroyed.]({{<baseurl>}}/rancher/v2.6/en/cluster-provisioning/registered-clusters/#additional-features-for-registered-eks-and-gke-clusters)
+\* Registered GKE, EKS and AKS clusters have the same options available as GKE, EKS and AKS clusters created from the Rancher UI. The key difference is that when a registered cluster is deleted from the Rancher UI, [it is not destroyed.]({{<baseurl>}}/rancher/v2.5/en/cluster-provisioning/registered-clusters/#additional-features-for-registered-eks-and-gke-clusters)
 
-\* \* Cluster configuration options can't be edited for imported clusters, except for [K3s and RKE2 clusters.]({{<baseurl>}}/rancher/v2.6/en/cluster-provisioning/imported-clusters/)
+\* \* Cluster configuration options can't be edited for imported clusters, except for [K3s and RKE2 clusters.]({{<baseurl>}}/rancher/v2.5/en/cluster-provisioning/imported-clusters/)
 
 \* \* \* For registered cluster nodes, the Rancher UI exposes the ability to cordon drain, and edit the node.
-

From cc1c8da1d3683b96cc269268f9ffe1d9eec1d5e4 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Mon, 7 Jun 2021 08:10:35 -0700
Subject: [PATCH 03/12] Update AKS cluster config reference

---
 .../aks-config-reference/_index.md            | 76 +++++++++++++++----
 1 file changed, 60 insertions(+), 16 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index c06bc4891fa..7b5f7e10ff2 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -3,6 +3,7 @@ title: AKS Cluster Configuration Reference
 weight: 4
 ---
 
+
 ### Changes in v2.6
 
 - Support for node pools
@@ -12,9 +13,7 @@ weight: 4
 - For networking, a new field was added in the UI: Support Private Kubernetes Service
 - Windows support was removed
 
-### HTTP Application
 
-This feature allows you to set up an ingress controller in Azure.
 
 ### Account Access
 
@@ -30,41 +29,77 @@ Complete each drop-down and field using the information obtained for your IAM po
 # OLD
 
 1. Use your subscription ID, tenant ID, app ID, and client secret to give your cluster access to AKS. If you don't have all of that information, you can retrieve it using these instructions:
-  - **App ID and tenant ID:** To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page. 
+
   - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.** 
   - **Subscription ID:** You can get the subscription ID is available in the portal from **All services > Subscriptions.**
 
 
+
+### HTTP Application
+
+This feature allows you to set up an ingress controller in Azure.
+
+
 # NEW
 
 # Cloud Credentials
 
+### Application ID and Tenant ID
+
+To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page. 
+
 ### Subscription
 
-### Tenant
+# Kubernetes Options
 
-It's possible to have multiple Tenants under an Azure Subscription.
+### DNS Prefix
 
-# Node Options
+### Monitoring
+enabled or disabled
 
-Node Options need to have these two options added: VM Sizes and Node Count, which then tie into Availability Zones (AZ).
+### HTTP Application Routing
+enabled or disabled
 
-Not all regions have support for AZs. 
-
-### Node Autoscaler
+### Tags
 
 # Node Pools
 
+
 The Azure interface allows users to specify whether a Primary Node Pool relies on either `system` (normally used for control planes) and `user` (what is most typically needed for Rancher).
 
 For Primary Node Pools, you can specify Mode, OS, Count and Size.
 
 For subsequent node pools, the Rancher UI forces the default of user.
 
-### agentpools
+Node Options need to have these two options added: VM Sizes and Node Count, which then tie into Availability Zones (AZ).
+
+Not all regions have support for AZs. 
+
+### Linux Admin Username
+azureuser
+
+### Cluster Resource Group
+info in UI
+### LoadBalancer SKU
+Basic or standard
+
+### VM Size
 
 ### Node Count
 There are maximums tied to subscriptions we need to warn about.
+### OS Disk Size
+
+### Networking
+Default or advanced
+
+### SSH Public Key
+
+### Node Autoscaler
+new
+
+
+### agentpools
+
 
 ### OS
 
@@ -82,8 +117,20 @@ Maximum pods per node defaults to 110 with a maximum of 250.
 
 Can adopt HTTP App Routing.
 
-### Security
- along with section for Security with a new field: Support Private Kubernetes Service Support.
+### Network Plugin
+
+### Kubernetes service address range
+
+A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. For example: 10.0.0.0/16.
+
+### Kubernetes DNS service IP address
+
+An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range. For example: 10.0.0.10
+
+### Docker bridge access
+An IP address and netmask assigned to Docker Bridge. It must not be in any Subnet IP ranges, or the Kubernetes service address range. For example: 172:17.0.1/16.
+
+### Support Private Kubernetes Service
 
 ### Load Balancing
 
@@ -92,6 +139,3 @@ There are two choices: Standard and Basic. Some are specific to regions and AZs.
 # Private and Public Clusters
 
 There are questions about whether private nodes are in fact public.
-
-# Advanced Options
-

From c2d3fc439362584424e963991fe626c6e8d9489b Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Wed, 16 Jun 2021 11:07:22 -0700
Subject: [PATCH 04/12] Change 2.5 to 2.6 in links

---
 .../cluster-capabilities-table/index.md       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md b/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md
index 3d2d1f88a5e..644a8fe927b 100644
--- a/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md
+++ b/content/rancher/v2.6/en/cluster-provisioning/cluster-capabilities-table/index.md
@@ -5,24 +5,24 @@ headless: true
 
 | Action | Rancher Launched Kubernetes Clusters |  EKS, GKE and AKS Clusters* | Other Hosted Kubernetes Clusters | Non-EKS or GKE Registered Clusters |
 | --- | --- | ---| ---|----|
-| [Using kubectl and a kubeconfig file to Access a Cluster]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cluster-access/kubectl/) | ✓ | ✓ | ✓ | ✓ |
-| [Managing Cluster Members]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cluster-access/cluster-members/) | ✓ | ✓ | ✓ | ✓ |
-| [Editing and Upgrading Clusters]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/editing-clusters/) | ✓ | ✓ | ✓ | ** |
-| [Managing Nodes]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/nodes) | ✓ | ✓ | ✓ | ✓ *** |
-| [Managing Persistent Volumes and Storage Classes]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/volumes-and-storage/) | ✓ | ✓ | ✓ | ✓ |
-| [Managing Projects, Namespaces and Workloads]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/projects-and-namespaces/) | ✓ | ✓ | ✓ | ✓ |
-| [Using App Catalogs]({{<baseurl>}}/rancher/v2.5/en/catalog/) | ✓ | ✓ | ✓ | ✓ |
-| [Configuring Tools (Alerts, Notifiers, Logging, Monitoring, Istio)]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/tools/) | ✓ | ✓ | ✓ | ✓ |
-| [Running Security Scans]({{<baseurl>}}/rancher/v2.5/en/security/security-scan/) | ✓ | ✓ | ✓ | ✓ |
-| [Cloning Clusters]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cloning-clusters/)| ✓ | ✓ |✓ | |
-| [Ability to rotate certificates]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/certificate-rotation/) | ✓ | ✓  |  | |
-| [Ability to back up your Kubernetes Clusters]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/backing-up-etcd/) | ✓ | ✓ |  | |
-| [Ability to recover and restore etcd]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/restoring-etcd/) | ✓ |  ✓ |  | |
-| [Cleaning Kubernetes components when clusters are no longer reachable from Rancher]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/cleaning-cluster-nodes/) | ✓ | | | |
-| [Configuring Pod Security Policies]({{<baseurl>}}/rancher/v2.5/en/cluster-admin/pod-security-policy/) | ✓ | ✓ |  ||
+| [Using kubectl and a kubeconfig file to Access a Cluster]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cluster-access/kubectl/) | ✓ | ✓ | ✓ | ✓ |
+| [Managing Cluster Members]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cluster-access/cluster-members/) | ✓ | ✓ | ✓ | ✓ |
+| [Editing and Upgrading Clusters]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/) | ✓ | ✓ | ✓ | ** |
+| [Managing Nodes]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/nodes) | ✓ | ✓ | ✓ | ✓ *** |
+| [Managing Persistent Volumes and Storage Classes]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/volumes-and-storage/) | ✓ | ✓ | ✓ | ✓ |
+| [Managing Projects, Namespaces and Workloads]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/projects-and-namespaces/) | ✓ | ✓ | ✓ | ✓ |
+| [Using App Catalogs]({{<baseurl>}}/rancher/v2.6/en/catalog/) | ✓ | ✓ | ✓ | ✓ |
+| [Configuring Tools (Alerts, Notifiers, Logging, Monitoring, Istio)]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/tools/) | ✓ | ✓ | ✓ | ✓ |
+| [Running Security Scans]({{<baseurl>}}/rancher/v2.6/en/security/security-scan/) | ✓ | ✓ | ✓ | ✓ |
+| [Cloning Clusters]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cloning-clusters/)| ✓ | ✓ |✓ | |
+| [Ability to rotate certificates]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/certificate-rotation/) | ✓ | ✓  |  | |
+| [Ability to back up your Kubernetes Clusters]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/backing-up-etcd/) | ✓ | ✓ |  | |
+| [Ability to recover and restore etcd]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/restoring-etcd/) | ✓ |  ✓ |  | |
+| [Cleaning Kubernetes components when clusters are no longer reachable from Rancher]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/cleaning-cluster-nodes/) | ✓ | | | |
+| [Configuring Pod Security Policies]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/pod-security-policy/) | ✓ | ✓ |  ||
 
-\* Registered GKE, EKS and AKS clusters have the same options available as GKE, EKS and AKS clusters created from the Rancher UI. The key difference is that when a registered cluster is deleted from the Rancher UI, [it is not destroyed.]({{<baseurl>}}/rancher/v2.5/en/cluster-provisioning/registered-clusters/#additional-features-for-registered-eks-and-gke-clusters)
+\* Registered GKE, EKS and AKS clusters have the same options available as GKE, EKS and AKS clusters created from the Rancher UI. The key difference is that when a registered cluster is deleted from the Rancher UI, [it is not destroyed.]({{<baseurl>}}/rancher/v2.6/en/cluster-provisioning/registered-clusters/#additional-features-for-registered-eks-and-gke-clusters)
 
-\* \* Cluster configuration options can't be edited for imported clusters, except for [K3s and RKE2 clusters.]({{<baseurl>}}/rancher/v2.5/en/cluster-provisioning/imported-clusters/)
+\* \* Cluster configuration options can't be edited for imported clusters, except for [K3s and RKE2 clusters.]({{<baseurl>}}/rancher/v2.6/en/cluster-provisioning/imported-clusters/)
 
 \* \* \* For registered cluster nodes, the Rancher UI exposes the ability to cordon drain, and edit the node.

From 5313b28fa43eab4173912e5a630e2c370fe3ed8c Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Wed, 16 Jun 2021 19:19:16 -0700
Subject: [PATCH 05/12] Update AKS cluster configuration reference

---
 content/_index.html                           |  23 ++
 content/rancher/v2.6/en/_index.md             |   2 +-
 .../cluster-admin/editing-clusters/_index.md  |   1 +
 .../aks-config-reference/_index.md            | 272 +++++++++++-------
 .../hosted-kubernetes-clusters/aks/_index.md  |  41 +--
 5 files changed, 224 insertions(+), 115 deletions(-)

diff --git a/content/_index.html b/content/_index.html
index fe9ce90017d..fe7f300004c 100644
--- a/content/_index.html
+++ b/content/_index.html
@@ -91,6 +91,29 @@
         <div class="row max-sized cards-container">
             <div class="col-12 cards-wrap">
                 <div class="row center-xs card-items-wrap">
+                  <div class="
+                      col-xl-4
+                      col-lg-4
+                      col-md-4
+                      col-sm-12
+                      col-xs-12
+                      col-12
+                      card-item">
+                        <div class="card-wrap">
+                            <h3 class="title-label">
+                                <span class="background">2.6</span>
+                                Rancher 2.6
+                            </h3>
+
+                            <hr/>
+
+                            <p class="description-label">Rancher manages all of your Kubernetes clusters everywhere, unifies them under centralized RBAC, monitors them and lets you easily deploy and manage workloads through an intuitive user interface.</p>
+
+                            <div class="buttons-container">
+                              <a href="{{<baseurl>}}/rancher/v2.6/en/">Rancher v2.6</a>
+                            </div>
+                        </div>
+                    </div>
                     <div class="
                       col-xl-4
                       col-lg-4
diff --git a/content/rancher/v2.6/en/_index.md b/content/rancher/v2.6/en/_index.md
index 65bea64d768..f9b1d34fa0f 100644
--- a/content/rancher/v2.6/en/_index.md
+++ b/content/rancher/v2.6/en/_index.md
@@ -16,6 +16,6 @@ One Rancher server installation can manage thousands of Kubernetes clusters and
 
 Rancher adds significant value on top of Kubernetes, first by centralizing authentication and role-based access control (RBAC) for all of the clusters, giving global admins the ability to control cluster access from one location.
 
-It then enables detailed monitoring and alerting for clusters and their resources, ships logs to external providers, and integrates directly with Helm via the Application Catalog. If you have an external CI/CD system, you can plug it into Rancher, but if you don't, Rancher even includes a pipeline engine to help you automatically deploy and upgrade workloads.
+It then enables detailed monitoring and alerting for clusters and their resources, ships logs to external providers, and integrates directly with Helm via the Application Catalog. If you have an external CI/CD system, you can plug it into Rancher, but if you don't, Rancher even includes Fleet to help you automatically deploy and upgrade workloads.
 
 Rancher is a _complete_ container management platform for Kubernetes, giving you the tools to successfully run Kubernetes anywhere.
\ No newline at end of file
diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/_index.md
index bb18700c326..a9198ea3353 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/_index.md
@@ -16,6 +16,7 @@ The cluster configuration options depend on the type of Kubernetes cluster:
 - [RKE Cluster Configuration](./rke-config-reference)
 - [EKS Cluster Configuration](./eks-config-reference)
 - [GKE Cluster Configuration](./gke-config-reference)
+- [AKS Cluster Configuration](./aks-config-reference)
 
 ### Cluster Management Capabilities by Cluster Type
 
diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index 7b5f7e10ff2..df7a921ec0e 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -1,10 +1,10 @@
 ---
+shortTitle: AKS Cluster Configuration
 title: AKS Cluster Configuration Reference
 weight: 4
 ---
 
-
-### Changes in v2.6
+# Changes in v2.6
 
 - Support for node pools
 - Support for private clusters
@@ -13,129 +13,209 @@ weight: 4
 - For networking, a new field was added in the UI: Support Private Kubernetes Service
 - Windows support was removed
 
+# Role-based Access Control
 
+When provisioning an AKS cluster in the Rancher UI, RBAC is not configurable because it is required to be enabled.
 
-### Account Access
-
-Complete each drop-down and field using the information obtained for your IAM policy.
-
-| Setting    | Description       |
-| ---------- | -------------------------------------------------------------------------------------------------------------------- |
-| Region     | From the drop-down choose the geographical region in which to build your cluster.                                    |
-| Cloud Credentials | Select the cloud credentials that you created for your IAM policy. For more information on creating cloud credentials in Rancher, refer to [this page.]({{<baseurl>}}/rancher/v2.x/en/user-settings/cloud-credentials/) |
-
-[Microsoft Documentation: How to create and use an SSH public and private key pair](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/mac-create-ssh-keys)
-
-# OLD
-
-1. Use your subscription ID, tenant ID, app ID, and client secret to give your cluster access to AKS. If you don't have all of that information, you can retrieve it using these instructions:
-
-  - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.** 
-  - **Subscription ID:** You can get the subscription ID is available in the portal from **All services > Subscriptions.**
-
-
-
-### HTTP Application
-
-This feature allows you to set up an ingress controller in Azure.
-
-
-# NEW
+RBAC is required for AKS clusters that are registered or imported into Rancher.
 
 # Cloud Credentials
 
-### Application ID and Tenant ID
+> The configuration information in this section assumes you have already set up a service principal for Rancher. For step-by-step instructions for how to set up the service principal, see [this section.]({{<baseurl>}}/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-cluster/aks/#prerequisites-in-microsoft-azure)
 
-To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page. 
+### Tenant ID
 
-### Subscription
+To get the tenant ID, go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations**, then click the name of the service principal. The tenant ID is listed on the app registration detail page as **Directory (tenant) ID**.
 
-# Kubernetes Options
+### Subscription ID
 
-### DNS Prefix
+To get the subscription ID, click **All Services** in the left navigation bar. Then click **Subscriptions.** Go to the name of the subscription that you want to associate with your Kubernetes cluster and copy the **Subscription ID.**
 
-### Monitoring
-enabled or disabled
+### Client ID
 
-### HTTP Application Routing
-enabled or disabled
+To get the client ID, go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The client ID is listed on the app registration detail page as **Application (client) ID**.
+
+### Client Secret
+
+You can't retrieve the client secret value after it is created, so if you don't already have a client secret value, you will need to create a new client secret.
+
+To get a new client secret, go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal.
+
+Then click **Certificates & secrets** and click **New client secret.** Click **Add.** Then copy the **Value** of the new client secret.
+
+### Environment
+
+Microsoft provides multiple [clouds](https://docs.microsoft.com/en-us/cli/azure/cloud?view=azure-cli-latest) for compliance with regional laws, which are available for your use:
+
+- AzurePublicCloud
+- AzureGermanCloud
+- AzureChinaCloud
+- AzureUSGovernmentCloud
+
+# Account Access
+
+In this section you will need to select an existing Azure cloud credential or create a new one.
+
+For help configuring your Azure cloud credential, see [this section.](#cloud-credentials)
+
+# Cluster Location
+
+Configure the cluster and node location. For more information on availability zones for AKS, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/availability-zones)
+
+The high availability locations include multiple availability zones.
+
+# Cluster Options
+
+Create an SSH connection to the cluster nodes using these configuration options.
+
+### Kubernetes Version
+
+The available Kubernetes versions are dynamically fetched from the Azure API.
+
+### Cluster Resource Group
+
+A resource group is a container that holds related resources for an Azure solution. The resource group can include all the resources for the solution, or only those resources that you want to manage as a group. You decide how you want to allocate resources to resource groups based on what makes the most sense for your organization. Generally, add resources that share the same lifecycle to the same resource group so you can easily deploy, update, and delete them as a group.
+
+Use an existing resource group or enter a resource group name and one will be created for you.
+
+Using a resource group containing an existing AKS cluster will create a new resource group. Azure AKS only allows one AKS cluster per resource group.
+
+For information on managing resource groups, see the [Azure documentation.](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/manage-resource-groups-portal)
+
+### Linux Admin Username
+
+The username used to create an SSH connection to the Linux nodes.
+
+The default username for AKS nodes is `azureuser`.
+
+### SSH Public Key
+
+The key used to create an SSH connection to the Linux nodes.
 
 ### Tags
 
+Cluster tags can be useful if your organization uses tags as a way to organize resources across multiple Azure services. These tags don't apply to resources within the cluster.
+
+# Networking Options
+
+### LoadBalancer SKU
+
+Azure load balancers support both standard and basic SKUs (stock keeping units).
+
+For a comparison of standard and basic load balancers, see the official [Azure documentation.](https://docs.microsoft.com/en-us/azure/load-balancer/skus#skus) Microsoft recommends the Standard load balancer.
+
+The Standard load balancer is required if you have selected one or more availability zones, or if you have more than one node pool.
+
+### Network Policy
+
+All pods in an AKS cluster can send and receive traffic without limitations, by default. To improve security, you can define rules that control the flow of traffic. The Network Policy feature in Kubernetes lets you define rules for ingress and egress traffic between pods in a cluster.
+
+Azure provides two ways to implement network policy. You choose a network policy option when you create an AKS cluster. The policy option can't be changed after the cluster is created:
+
+- Azure's own implementation, called Azure Network Policies. The Azure network policy requires the Azure CNI.
+- Calico Network Policies, an open-source network and network security solution founded by [Tigera](https://www.tigera.io/).
+
+You can also choose to have no network policy.
+
+For more information about the differences between Azure and Calico network policies and their capabilities, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/use-network-policies#differences-between-azure-and-calico-policies-and-their-capabilities)
+
+### DNS Prefix
+Enter a unique DNS prefix for your cluster's Kubernetes API server FQDN.
+
+### Network Plugin
+There are two network plugins: kubenet and Azure CNI.
+
+The [kubenet](https://kubernetes.io/docs/concepts/cluster-administration/network-plugins/#kubenet) Kubernetes plugin is the default configuration for AKS cluster creation. When kubenet is used, each node in the cluster receives a routable IP address. The pods use NAT to communicate with other resources outside the AKS cluster. This approach reduces the number of IP addresses you need to reserve in your network space for pods to use.
+
+With the Azure CNI (advanced) networking plugin, pods get full virtual network connectivity and can be directly reached via their private IP address from connected networks. This plugin requires more IP address space.
+
+For more information on the differences between kubenet and Azure CNI, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/concepts-network#compare-network-models)
+
+### HTTP Application Routing
+
+When enabled, the HTTP application routing add-on makes it easier to access applications deployed to the AKS cluster. It deploys two components: a [Kubernetes Ingress controller](https://kubernetes.io/docs/concepts/services-networking/ingress/) and an [External-DNS](https://github.com/kubernetes-incubator/external-dns) controller.
+
+For more information, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/http-application-routing)
+
+### Set Authorized IP Ranges
+
+You can secure access to the Kubernetes API server using [authorized IP address ranges.](https://docs.microsoft.com/en-us/azure/aks/api-server-authorized-ip-ranges#overview-of-api-server-authorized-ip-ranges)
+
+The Kubernetes API server exposes the Kubernetes API. This component provides the interaction for management tools, such as kubectl. AKS provides a single-tenant cluster control plane with a dedicated API server. By default, the API server is assigned a public IP address, and you should control access to it using Kubernetes-based or Azure-based RBAC.
+
+To secure access to the otherwise publicly accessible AKS control plane and API server, you can enable and use authorized IP ranges. These authorized IP ranges only allow defined IP address ranges to communicate with the API server.
+
+However, even if you use authorized IP address ranges, you should still use Kubernetes RBAC or Azure RBAC to authorize users and the actions they request.
+### Container Monitoring
+
+Container monitoring gives you performance visibility by collecting memory and processor metrics from controllers, nodes, and containers that are available in Kubernetes through the Metrics API. Container logs are also collected. After you enable monitoring, metrics and logs are automatically collected for you through a containerized version of the Log Analytics agent for Linux. Metrics are written to the metrics store and log data is written to the logs store associated with your [Log Analytics](https://docs.microsoft.com/en-us/azure/azure-monitor/logs/log-query-overview) workspace.
+
+### Log Analytics Workspace Resource Group
+
+The [resource group](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/overview#resource-groups) containing the Log Analytics Workspace. You must create at least one workspace to use Azure Monitor Logs. 
+
+### Log Analytics Workspace Name
+
+Data collected by Azure Monitor Logs is stored in one or more [Log Analytics workspaces.](https://docs.microsoft.com/en-us/azure/azure-monitor/logs/design-logs-deployment) The workspace defines the geographic location of the data, access rights defining which users can access data, and configuration settings such as the pricing tier and data retention.
+
+You must create at least one workspace to use Azure Monitor Logs. A single workspace may be suffxicient for all of your monitoring data, or may choose to create multiple workspaces depending on your requirements. For example, you might have one workspace for your production data and another for testing.
+
+For more information about Azure Monitor Logs, see the [Azure documentation.](https://docs.microsoft.com/en-us/azure/azure-monitor/logs/data-platform-logs)
+
+### Support Private Kubernetes Service
+
+Typically, AKS worker nodes do not get public IPs, regardless of whether the cluster is private, with some exceptions. In a private cluster, the control plane does not have a public endpoint.
+
+In order to a to be able to connect with the AKS Kubernetes API server,
+
+- The Rancher agent needs to be deployed from a node that has access to the AKS cluster's Azure Virtual Network (VNet).
+- Rancher needs to be running on the same [NAT](https://docs.microsoft.com/en-us/azure/virtual-network/nat-overview) as the AKS nodes.
+
+For more information about connecting to an AKS private cluster, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/private-clusters#options-for-connecting-to-the-private-cluster)
+
 # Node Pools
 
-
+### Mode
 The Azure interface allows users to specify whether a Primary Node Pool relies on either `system` (normally used for control planes) and `user` (what is most typically needed for Rancher).
 
 For Primary Node Pools, you can specify Mode, OS, Count and Size.
 
-For subsequent node pools, the Rancher UI forces the default of user.
+System node pools that always require running nodes, so they cannot be scaled below one node. At least one system node pool is required.
 
-Node Options need to have these two options added: VM Sizes and Node Count, which then tie into Availability Zones (AZ).
+For subsequent node pools, the Rancher UI forces the default of User. User node pools allow you to scale to zero nodes. User node pools don't run any part of the Kubernetes controlplane.
 
-Not all regions have support for AZs. 
+AKS doesn't expose the nodes that run the Kubernetes controlplane components.
 
-### Linux Admin Username
-azureuser
+### Availability Zones
 
-### Cluster Resource Group
-info in UI
-### LoadBalancer SKU
-Basic or standard
+[Availability zones](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) are unique physical locations within a region. Each zone is made up of one or more data centers equipped with independent power, cooling, and networking.
+
+Not all regions have support for availability zones. For a list of Azure regions with availability zones, see the [Azure documentation.](https://docs.microsoft.com/en-us/azure/availability-zones/az-region#azure-regions-with-availability-zones)
 
 ### VM Size
 
+Choose a size for each VM in the node pool. For details about each VM size, see [this page.](https://azure.microsoft.com/en-us/pricing/details/virtual-machines/linux/)
+
+### OS Disk Type
+
+The nodes in the node pool can have either managed or ephemeral disks.
+
+[Ephemeral OS disks](https://docs.microsoft.com/en-us/azure/virtual-machines/ephemeral-os-disks) are created on the local virtual machine storage and not saved to the remote Azure Storage. Ephemeral OS disks work well for stateless workloads, where applications are tolerant of individual VM failures, but are more affected by VM deployment time or reimaging the individual VM instances. With Ephemeral OS disk, you get lower read/write latency to the OS disk and faster VM reimage.
+
+[Azure managed disks](https://docs.microsoft.com/en-us/azure/virtual-machines/managed-disks-overview) are block-level storage volumes that are managed by Azure and used with Azure Virtual Machines. Managed disks are designed for 99.999% availability. Managed disks achieve this by providing you with three replicas of your data, allowing for high durability.
+
+### OS Disk Size
+
+The size in GB for the disk for each node.
+
 ### Node Count
-There are maximums tied to subscriptions we need to warn about.
-### OS Disk Size
+The number of nodes in the node pool. The maximum number of nodes may be limited by your [Azure subscription.](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/azure-subscription-service-limits)
 
-### Networking
-Default or advanced
+### Max Pods Per Node
+The maximum number of pods per node defaults to 110 with a maximum of 250.
 
-### SSH Public Key
+### Enable Auto Scaling
 
-### Node Autoscaler
-new
+When auto scaling is enabled, you will need to enter a minimum and maximum node count.
 
-
-### agentpools
-
-
-### OS
-
-Linux and Windows pools aren't interchangeable (or cross-accessible)
-
-### OS Disk Size
-
-OS Disk Size: not exposed in the API?
-
-### Maximum Pods per Node
-
-Maximum pods per node defaults to 110 with a maximum of 250.
-
-# Networking
-
-Can adopt HTTP App Routing.
-
-### Network Plugin
-
-### Kubernetes service address range
-
-A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. For example: 10.0.0.0/16.
-
-### Kubernetes DNS service IP address
-
-An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range. For example: 10.0.0.10
-
-### Docker bridge access
-An IP address and netmask assigned to Docker Bridge. It must not be in any Subnet IP ranges, or the Kubernetes service address range. For example: 172:17.0.1/16.
-
-### Support Private Kubernetes Service
-
-### Load Balancing
-
-There are two choices: Standard and Basic. Some are specific to regions and AZs. We default to Standard because Basic has fewer options and may be deprecated soon.
-
-# Private and Public Clusters
-
-There are questions about whether private nodes are in fact public.
+When Auto Scaling is enabled, you can't manually scale the node pool. The scale is controlled by the AKS autoscaler.
\ No newline at end of file
diff --git a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
index 28b436722cf..abe4cf492f2 100644
--- a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
+++ b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
@@ -15,6 +15,7 @@ You can use Rancher to create a cluster hosted in Microsoft Azure Kubernetes Ser
 - [2. Create the AKS Cluster](#2-create-the-aks-cluster)
 - [Role-based Access Control](#role-based-access-control)
 - [AKS Cluster Configuration Reference](#aks-cluster-configuration-reference)
+- [Private Clusters](#private-clusters)
 - [Minimum AKS Permissions](#minimum-aks-permissions)
 - [Syncing](#syncing)
 
@@ -27,11 +28,10 @@ To interact with Azure APIs, an AKS cluster requires an Azure Active Directory (
 
 Before creating the service principal, you need to obtain the following information from the [Microsoft Azure Portal](https://portal.azure.com):
 
-- Your subscription ID
-- Your tenant ID
-- An app ID (also called a client ID)
+- Subscription ID
+- Tenant ID
+- Client ID
 - Client secret
-- A resource group
 
 The below sections describe how to set up these prerequisites using either the Azure command line tool or the Azure portal.
 
@@ -106,39 +106,44 @@ To give role-based access to your service principal,
 
 # 1. Create the AKS Cloud Credentials
 
-1. From the **Cluster Management** global app, click **Cloud Credentials.**
+1. In the Rancher UI, click **☰ > Cluster Management.**
+1. Click **Cloud Credentials.**
 1. Click **Create.**
-1. Click **Azure AKS.**
-1. Fill out the form. For help with filling out the form, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference)
+1. Click **Azure.**
+1. Fill out the form. For help with filling out the form, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/#cloud-credentials)
 
 # 2. Create the AKS Cluster
 
 Use Rancher to set up and configure your Kubernetes cluster.
 
-1. From the **Cluster Management** global app, click **Clusters.**
-1. Click **Create.**
-1. Choose **Azure AKS**.
-1. Enter a **Cluster Name**.
-1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
+1. In the Rancher UI, click **☰ > Cluster Management.**
+1. In the **Clusters** section, click **Create.**
+1. Click **Azure AKS.**
 1. Fill out the form. For help with filling out the form, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference)
 
 **Result:** Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
 
 You can access your cluster after its state is updated to **Active.**
 
-**Active** clusters are assigned two Projects: 
-
-- `Default`, containing the `default` namespace
-- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
-
 # Role-based Access Control
-Upon registering or importing a cluster won't work without RBAC enabled.
+When provisioning an AKS cluster in the Rancher UI, RBAC is not configurable because it is required to be enabled.
+
+RBAC is required for AKS clusters that are registered or imported into Rancher.
 
 # AKS Cluster Configuration Reference
 
 For more information about how to configure AKS clusters from the Rancher UI, see the [configuration reference.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference)
 
+# Private Clusters
 
+Typically, AKS worker nodes do not get public IPs, regardless of whether the cluster is private, with some exceptions. In a private cluster, the control plane does not have a public endpoint.
+
+In order to a to be able to connect with the AKS Kubernetes API server,
+
+- The Rancher agent needs to be deployed from a node that has access to the AKS cluster's Azure Virtual Network (VNet).
+- Rancher needs to be running on the same [NAT](https://docs.microsoft.com/en-us/azure/virtual-network/nat-overview) as the AKS nodes.
+
+For more information about connecting to an AKS private cluster, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/private-clusters#options-for-connecting-to-the-private-cluster)
 
 # Syncing
 

From da06387e5b71299a1d8cf109d62d76e38c62cd79 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Tue, 29 Jun 2021 00:14:05 -0700
Subject: [PATCH 06/12] Update
 content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md

Co-authored-by: Billy Tat <btat@suse.com>
---
 .../editing-clusters/aks-config-reference/_index.md           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index df7a921ec0e..3a8ecb99318 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -176,7 +176,7 @@ For more information about connecting to an AKS private cluster, see the [AKS do
 # Node Pools
 
 ### Mode
-The Azure interface allows users to specify whether a Primary Node Pool relies on either `system` (normally used for control planes) and `user` (what is most typically needed for Rancher).
+The Azure interface allows users to specify whether a Primary Node Pool relies on either `system` (normally used for control planes) or `user` (what is most typically needed for Rancher).
 
 For Primary Node Pools, you can specify Mode, OS, Count and Size.
 
@@ -218,4 +218,4 @@ The maximum number of pods per node defaults to 110 with a maximum of 250.
 
 When auto scaling is enabled, you will need to enter a minimum and maximum node count.
 
-When Auto Scaling is enabled, you can't manually scale the node pool. The scale is controlled by the AKS autoscaler.
\ No newline at end of file
+When Auto Scaling is enabled, you can't manually scale the node pool. The scale is controlled by the AKS autoscaler.

From 90938be38d883c3aaba743c3a2190bf186330464 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Tue, 29 Jun 2021 00:14:19 -0700
Subject: [PATCH 07/12] Update
 content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md

Co-authored-by: Billy Tat <btat@suse.com>
---
 .../editing-clusters/aks-config-reference/_index.md             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index 3a8ecb99318..48216504b62 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -180,7 +180,7 @@ The Azure interface allows users to specify whether a Primary Node Pool relies o
 
 For Primary Node Pools, you can specify Mode, OS, Count and Size.
 
-System node pools that always require running nodes, so they cannot be scaled below one node. At least one system node pool is required.
+System node pools always require running nodes, so they cannot be scaled below one node. At least one system node pool is required.
 
 For subsequent node pools, the Rancher UI forces the default of User. User node pools allow you to scale to zero nodes. User node pools don't run any part of the Kubernetes controlplane.
 

From 6f800f683c758b0220f43248bc4a5eadc1557e7e Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Tue, 29 Jun 2021 00:14:33 -0700
Subject: [PATCH 08/12] Update
 content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md

Co-authored-by: Billy Tat <btat@suse.com>
---
 .../hosted-kubernetes-clusters/aks/_index.md                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
index abe4cf492f2..28b516d8e53 100644
--- a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
+++ b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
@@ -147,6 +147,6 @@ For more information about connecting to an AKS private cluster, see the [AKS do
 
 # Syncing
 
-The GKE provisioner can synchronize the state of a GKE cluster between Rancher and the provider. For an in-depth technical explanation of how this works, see [Syncing.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/syncing)
+The AKS provisioner can synchronize the state of an AKS cluster between Rancher and the provider. For an in-depth technical explanation of how this works, see [Syncing.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/syncing)
 
-For information on configuring the refresh interval, see [this section.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/gke-config-reference/#configuring-the-refresh-interval)
\ No newline at end of file
+For information on configuring the refresh interval, see [this section.]({{<baseurl>}}/rancher/v2.6/en/cluster-admin/editing-clusters/gke-config-reference/#configuring-the-refresh-interval)

From f0e8b68d030a477f0e45b0e39c4fb8a7bbe82b5e Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Tue, 29 Jun 2021 01:01:19 -0700
Subject: [PATCH 09/12] Respond to feedback on AKS docs

---
 .../aks-config-reference/_index.md              | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index 48216504b62..c89281388f5 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -10,14 +10,12 @@ weight: 4
 - Support for private clusters
 - Enabled autoscaling node pools
 - The AKS permissions are now configured in cloud credentials
-- For networking, a new field was added in the UI: Support Private Kubernetes Service
-- Windows support was removed
 
 # Role-based Access Control
 
-When provisioning an AKS cluster in the Rancher UI, RBAC is not configurable because it is required to be enabled.
+When provisioning an AKS cluster in the Rancher UI, RBAC cannot be disabled. If role-based access control is disabled for the cluster in AKS, the cluster cannot be registered or imported into Rancher.
 
-RBAC is required for AKS clusters that are registered or imported into Rancher.
+Rancher can configure member roles for AKS clusters in the same way as any other cluster. For more information, see the section on [role-based access control.]({{<baseurl>}}/rancher/v2.6/en/admin-settings/rbac)
 
 # Cloud Credentials
 
@@ -66,8 +64,6 @@ The high availability locations include multiple availability zones.
 
 # Cluster Options
 
-Create an SSH connection to the cluster nodes using these configuration options.
-
 ### Kubernetes Version
 
 The available Kubernetes versions are dynamically fetched from the Azure API.
@@ -164,12 +160,13 @@ For more information about Azure Monitor Logs, see the [Azure documentation.](ht
 
 ### Support Private Kubernetes Service
 
-Typically, AKS worker nodes do not get public IPs, regardless of whether the cluster is private, with some exceptions. In a private cluster, the control plane does not have a public endpoint.
+Typically, AKS worker nodes do not get public IPs, regardless of whether the cluster is private. In a private cluster, the control plane does not have a public endpoint.
 
-In order to a to be able to connect with the AKS Kubernetes API server,
+Rancher can connect to a private AKS cluster in one of two ways.
 
-- The Rancher agent needs to be deployed from a node that has access to the AKS cluster's Azure Virtual Network (VNet).
-- Rancher needs to be running on the same [NAT](https://docs.microsoft.com/en-us/azure/virtual-network/nat-overview) as the AKS nodes.
+The first way to ensure that Rancher is running on the same [NAT](https://docs.microsoft.com/en-us/azure/virtual-network/nat-overview) as the AKS nodes.
+
+The second way is to run a command to register the cluster with Rancher. Once the cluster is provisioned, you can run the displayed command anywhere you can connect to the cluster’s Kubernetes API. This command is displayed in a pop-up when you provision an AKS cluster with a private API endpoint enabled.
 
 For more information about connecting to an AKS private cluster, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/private-clusters#options-for-connecting-to-the-private-cluster)
 

From 04275b59689c54ffcbac7fe978721c17de189c96 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Tue, 29 Jun 2021 01:05:06 -0700
Subject: [PATCH 10/12] Update section on AKS private clusters

---
 .../hosted-kubernetes-clusters/aks/_index.md             | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
index 28b516d8e53..f0496aea2cb 100644
--- a/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
+++ b/content/rancher/v2.6/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md
@@ -136,12 +136,13 @@ For more information about how to configure AKS clusters from the Rancher UI, se
 
 # Private Clusters
 
-Typically, AKS worker nodes do not get public IPs, regardless of whether the cluster is private, with some exceptions. In a private cluster, the control plane does not have a public endpoint.
+Typically, AKS worker nodes do not get public IPs, regardless of whether the cluster is private. In a private cluster, the control plane does not have a public endpoint.
 
-In order to a to be able to connect with the AKS Kubernetes API server,
+Rancher can connect to a private AKS cluster in one of two ways.
 
-- The Rancher agent needs to be deployed from a node that has access to the AKS cluster's Azure Virtual Network (VNet).
-- Rancher needs to be running on the same [NAT](https://docs.microsoft.com/en-us/azure/virtual-network/nat-overview) as the AKS nodes.
+The first way to ensure that Rancher is running on the same [NAT](https://docs.microsoft.com/en-us/azure/virtual-network/nat-overview) as the AKS nodes.
+
+The second way is to run a command to register the cluster with Rancher. Once the cluster is provisioned, you can run the displayed command anywhere you can connect to the cluster’s Kubernetes API. This command is displayed in a pop-up when you provision an AKS cluster with a private API endpoint enabled.
 
 For more information about connecting to an AKS private cluster, see the [AKS documentation.](https://docs.microsoft.com/en-us/azure/aks/private-clusters#options-for-connecting-to-the-private-cluster)
 

From 7e751b2c8805f17f880873c06c832234521ee898 Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Tue, 29 Jun 2021 01:06:56 -0700
Subject: [PATCH 11/12] Say more than one node pool can be added for AKS
 clusters

---
 .../editing-clusters/aks-config-reference/_index.md             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index c89281388f5..fbd69ab33c1 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -6,7 +6,7 @@ weight: 4
 
 # Changes in v2.6
 
-- Support for node pools
+- Support for adding more than one node pool
 - Support for private clusters
 - Enabled autoscaling node pools
 - The AKS permissions are now configured in cloud credentials

From 2962867a90e945ceaf658f6f7db05f7bbc7b532e Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Thu, 1 Jul 2021 22:45:34 -0700
Subject: [PATCH 12/12] Fix formatting

---
 .../editing-clusters/aks-config-reference/_index.md             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
index fbd69ab33c1..fb632e7d662 100644
--- a/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
+++ b/content/rancher/v2.6/en/cluster-admin/editing-clusters/aks-config-reference/_index.md
@@ -142,6 +142,7 @@ The Kubernetes API server exposes the Kubernetes API. This component provides th
 To secure access to the otherwise publicly accessible AKS control plane and API server, you can enable and use authorized IP ranges. These authorized IP ranges only allow defined IP address ranges to communicate with the API server.
 
 However, even if you use authorized IP address ranges, you should still use Kubernetes RBAC or Azure RBAC to authorize users and the actions they request.
+
 ### Container Monitoring
 
 Container monitoring gives you performance visibility by collecting memory and processor metrics from controllers, nodes, and containers that are available in Kubernetes through the Metrics API. Container logs are also collected. After you enable monitoring, metrics and logs are automatically collected for you through a containerized version of the Log Analytics agent for Linux. Metrics are written to the metrics store and log data is written to the logs store associated with your [Log Analytics](https://docs.microsoft.com/en-us/azure/azure-monitor/logs/log-query-overview) workspace.
@@ -173,6 +174,7 @@ For more information about connecting to an AKS private cluster, see the [AKS do
 # Node Pools
 
 ### Mode
+
 The Azure interface allows users to specify whether a Primary Node Pool relies on either `system` (normally used for control planes) or `user` (what is most typically needed for Rancher).
 
 For Primary Node Pools, you can specify Mode, OS, Count and Size.