Merge pull request #108015 from mumian/0317-aks

Make it compliant with the ARM quickstart guidance

Author: ttorble

articles/aks/TOC.yml

@@ -14,7 +14,8 @@
       href: kubernetes-walkthrough.md
     - name: Use the Azure portal
       href: kubernetes-walkthrough-portal.md
-    - name: Use a Resource Manager template
+    - name: Use ARM template
+      displayName: Resource Manager
       href: kubernetes-walkthrough-rm-template.md
   - name: Develop applications
     expanded: true
@@ -24,8 +25,8 @@
     - name: Azure Dev Spaces
       expanded: true
       items:
-      - name: Use Azure Dev Spaces for team development 
-        href: ../dev-spaces/quickstart-team-development.md 
+      - name: Use Azure Dev Spaces for team development
+        href: ../dev-spaces/quickstart-team-development.md
         maintainContext: true
       - name: Use Visual Studio Code
         href: ../dev-spaces/quickstart-netcore.md
@@ -37,10 +38,10 @@
         href: ../dev-spaces/quickstart-cli.md
         maintainContext: true
       - name: Use Azure Dev Spaces with Java
-        href: ../dev-spaces/quickstart-java.md 
+        href: ../dev-spaces/quickstart-java.md
         maintainContext: true
       - name: Use Azure Dev Spaces Node.js
-        href: ../dev-spaces/quickstart-nodejs.md 
+        href: ../dev-spaces/quickstart-nodejs.md
         maintainContext: true
 - name: Tutorials
   items:
@@ -159,7 +160,7 @@
     - name: NFS Server - Static
       href: azure-nfs-volume.md
     - name: Azure NetApp Files
-      href: azure-netapp-files.md      
+      href: azure-netapp-files.md
   - name: Configure networking
     items:
     - name: Create or use existing virtual network
@@ -326,25 +327,25 @@
       href: ../api-management/api-management-kubernetes.md
       maintainContext: true
   - name: Select and deploy a service mesh
-    items: 
+    items:
     - name: About Service Meshes
       href: servicemesh-about.md
     - name: Use Istio
-      items: 
+      items:
       - name: About Istio
         href: servicemesh-istio-about.md
       - name: Install and configure
         href: servicemesh-istio-install.md
       - name: Scenario - Intelligent routing and canary releases
         href: servicemesh-istio-scenario-routing.md
     - name: Use Linkerd
-      items: 
+      items:
       - name: About Linkerd
         href: servicemesh-linkerd-about.md
       - name: Install and configure
         href: servicemesh-linkerd-install.md
     - name: Use Consul
-      items: 
+      items:
       - name: About Consul
         href: servicemesh-consul-about.md
       - name: Install and configure
@@ -360,7 +361,7 @@
       href: ../devops-project/azure-devops-project-aks.md
       maintainContext: true
     - name: Deployment Center Launcher
-      href: deployment-center-launcher.md 
+      href: deployment-center-launcher.md
     - name: GitHub Actions for Kubernetes
       href: ../aks/kubernetes-action.md
   - name: Troubleshoot

articles/aks/kubernetes-walkthrough-rm-template.md

@@ -5,7 +5,7 @@ services: container-service
 ms.topic: quickstart
 ms.date: 04/19/2019
 
-ms.custom: mvc
+ms.custom: mvc,subject-armqs
 
 #Customer intent: As a developer or cluster operator, I want to quickly create an AKS cluster and deploy an application so that I can see how to run applications using the managed Kubernetes service in Azure.
 ---
@@ -16,6 +16,8 @@ Azure Kubernetes Service (AKS) is a managed Kubernetes service that lets you qui
 
 ![Image of browsing to Azure Vote](media/container-service-kubernetes-walkthrough/azure-voting-application.png)
 
+[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
+
 This quickstart assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for Azure Kubernetes Service (AKS)][kubernetes-concepts].
 
 If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
@@ -66,13 +68,21 @@ Make a note of the *appId* and *password*. These values are used in the followin
 
 ## Create an AKS cluster
 
-The template used in this quickstart is to [deploy an Azure Kubernetes Service cluster](https://azure.microsoft.com/resources/templates/101-aks/). For more AKS samples, see the [AKS quickstart templates][aks-quickstart-templates] site.
+### Review the template
+
+The template used in this quickstart is from [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/101-aks/).
+
+:::code language="json" source="~/quickstart-templates/101-aks/azuredeploy.json" range="1-126" highlight="86-118":::
+
+For more AKS samples, see the [AKS quickstart templates][aks-quickstart-templates] site.
+
+### Deploy the template
 
 1. Select the following image to sign in to Azure and open a template.
 
     [![Deploy to Azure](./media/kubernetes-walkthrough-rm-template/deploy-to-azure.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-aks%2Fazuredeploy.json)
 
-2. Select or enter the following values.  
+2. Select or enter the following values.
 
     For this quickstart, leave the default values for the *OS Disk Size GB*, *Agent Count*, *Agent VM Size*, *OS Type*, and *Kubernetes Version*. Provide your own values for the following template parameters:
 
@@ -93,7 +103,9 @@ The template used in this quickstart is to [deploy an Azure Kubernetes Service c
 
 It takes a few minutes to create the AKS cluster. Wait for the cluster to be successfully deployed before you move on to the next step.
 
-## Connect to the cluster
+## Validate the deployment
+
+### Connect to the cluster
 
 To manage a Kubernetes cluster, you use [kubectl][kubectl], the Kubernetes command-line client. If you use Azure Cloud Shell, `kubectl` is already installed. To install `kubectl` locally, use the [az aks install-cli][az-aks-install-cli] command:
 
@@ -122,7 +134,7 @@ aks-agentpool-41324942-1   Ready    agent   6m46s   v1.12.6
 aks-agentpool-41324942-2   Ready    agent   6m45s   v1.12.6
 ```
 
-## Run the application
+### Run the application
 
 A Kubernetes manifest file defines a desired state for the cluster, such as what container images to run. In this quickstart, a manifest is used to create all objects needed to run the Azure Vote application. This manifest includes two [Kubernetes deployments][kubernetes-deployment] - one for the sample Azure Vote Python applications, and the other for a Redis instance. Two [Kubernetes Services][kubernetes-service] are also created - an internal service for the Redis instance, and an external service to access the Azure Vote application from the internet.
 
@@ -231,7 +243,7 @@ deployment "azure-vote-front" created
 service "azure-vote-front" created
 ```
 
-## Test the application
+### Test the application
 
 When the application runs, a Kubernetes service exposes the application front end to the internet. This process can take a few minutes to complete.
 
@@ -258,7 +270,7 @@ To see the Azure Vote app in action, open a web browser to the external IP addre
 
 ![Image of browsing to Azure Vote](media/container-service-kubernetes-walkthrough/azure-voting-application.png)
 
-## Delete cluster
+## Clean up resources
 
 When the cluster is no longer needed, use the [az group delete][az-group-delete] command to remove the resource group, container service, and all related resources.