Merge pull request #278000 from pjlewisuk/main

Review of Kubernetes on Azure Tutorial with relevant updates

Author: AnnaMHuff

articles/aks/includes/aliasminorversion/alias-minor-version-upgrade.md

@@ -1,5 +1,5 @@
 > [!NOTE]
 >
-> If no patch is specified, the cluster automatically upgrades to the specified minor version's latest GA patch. For example, setting `--kubernetes-version` to `1.21` results in the cluster upgrading to `1.21.9`.
+> If no patch is specified, the cluster automatically upgrades to the specified minor version's latest GA patch. For example, setting `--kubernetes-version` to `1.28` results in the cluster upgrading to `1.28.9`.
 >
 > For more information, see [Supported Kubernetes minor version upgrades in AKS](../../supported-kubernetes-versions.md#alias-minor-version).

articles/aks/tutorial-kubernetes-deploy-application.md

@@ -2,7 +2,7 @@
 title: Kubernetes on Azure tutorial - Deploy an application to Azure Kubernetes Service (AKS)
 description: In this Azure Kubernetes Service (AKS) tutorial, you deploy a multi-container application to your cluster using images stored in Azure Container Registry.
 ms.topic: tutorial
-ms.date: 02/20/2023
+ms.date: 06/10/2024
 ms.custom: mvc, devx-track-extended-azdevcli
 #Customer intent: As a developer, I want to learn how to deploy apps to an Azure Kubernetes Service (AKS) cluster so that I can deploy and run my own applications.
 ---
@@ -57,11 +57,7 @@ In these tutorials, your Azure Container Registry (ACR) instance stores the cont
     az acr list --resource-group myResourceGroup --query "[].{acrLoginServer:loginServer}" --output table
     ```
 
-2. Make sure you're in the cloned *aks-store-demo* directory, and then open the manifest file with a text editor, such as `vi`.
-
-    ```azurecli-interactive
-    vi aks-store-quickstart.yaml
-    ```
+2. Make sure you're in the cloned *aks-store-demo* directory, and then open the `aks-store-quickstart.yaml` manifest file with a text editor.
 
 3. Update the `image` property for the containers by replacing *ghcr.io/azure-samples* with your ACR login server name.
 
@@ -79,21 +75,17 @@ In these tutorials, your Azure Container Registry (ACR) instance stores the cont
     ...
     ```
 
-4. Save and close the file. In `vi`, use `:wq`.
+4. Save and close the file.
 
 ### [Azure PowerShell](#tab/azure-powershell)
 
 1. Get your login server address using the [`Get-AzContainerRegistry`][get-azcontainerregistry] cmdlet and query for your login server. Make sure you replace `<acrName>` with the name of your ACR instance.
 
     ```azurepowershell-interactive
-    (Get-AzContainerRegistry -ResourceGroupName myResourceGroup -Name <acrName>).LoginServer
+    (Get-AzContainerRegistry -ResourceGroupName myResourceGroup -Name $ACRNAME).LoginServer
     ```
 
-2. Make sure you're in the cloned *aks-store-demo* directory, and then open the manifest file with a text editor, such as `vi`.
-
-    ```azurepowershell-interactive
-    vi aks-store-quickstart.yaml
-    ```
+2. Make sure you're in the cloned *aks-store-demo* directory, and then open the `aks-store-quickstart.yaml` manifest file with a text editor.
 
 3. Update the `image` property for the containers by replacing *ghcr.io/azure-samples* with your ACR login server name.
 
@@ -111,7 +103,7 @@ In these tutorials, your Azure Container Registry (ACR) instance stores the cont
     ...
     ```
 
-4. Save and close the file. In `vi`, use `:wq`.
+4. Save and close the file.
 
 ### [Azure Developer CLI](#tab/azure-azd)
 
@@ -132,7 +124,8 @@ In these tutorials, your Azure Container Registry (ACR) instance stores the cont
     The following example output shows the resources successfully created in the AKS cluster:
 
     ```output
-    deployment.apps/rabbitmq created
+    statefulset.apps/rabbitmq created
+    configmap/rabbitmq-enabled-plugins created
     service/rabbitmq created
     deployment.apps/order-service created
     service/order-service created
@@ -159,7 +152,8 @@ In these tutorials, your Azure Container Registry (ACR) instance stores the cont
     The following example output shows the resources successfully created in the AKS cluster:
 
     ```output
-    deployment.apps/rabbitmq created
+    statefulset.apps/rabbitmq created
+    configmap/rabbitmq-enabled-plugins created
     service/rabbitmq created
     deployment.apps/order-service created
     service/order-service created
@@ -210,21 +204,21 @@ When the application runs, a Kubernetes service exposes the application front en
     kubectl get service store-front --watch
     ```
 
-    Initially, the `EXTERNAL-IP` for the *store-front* service shows as *pending*:
+    Initially, the `EXTERNAL-IP` for the `store-front` service shows as `<pending>`:
 
     ```output
     store-front   LoadBalancer   10.0.34.242   <pending>     80:30676/TCP   5s
     ```
 
-2. When the `EXTERNAL-IP` address changes from *pending* to an actual public IP address, use `CTRL-C` to stop the `kubectl` watch process.
+2. When the `EXTERNAL-IP` address changes from `<pending>` to a public IP address, use `CTRL-C` to stop the `kubectl` watch process.
 
     The following example output shows a valid public IP address assigned to the service:
 
     ```output
     store-front   LoadBalancer   10.0.34.242   52.179.23.131   80:30676/TCP   67s
     ```
 
-3. View the application in action by opening a web browser to the external IP address of your service.
+3. View the application in action by opening a web browser and navigating to the external IP address of your service: `http://<external-ip>`.
 
     :::image type="content" source="./learn/media/quick-kubernetes-deploy-cli/aks-store-application.png" alt-text="Screenshot of AKS Store sample application." lightbox="./learn/media/quick-kubernetes-deploy-cli/aks-store-application.png":::
 
@@ -237,11 +231,27 @@ Navigate to your Azure portal to find your deployment information.
 1. Open your [Resource Group][azure-rg] on the Azure portal
 1. Navigate to the Kubernetes service for your cluster
 1. Select `Services and Ingress` under `Kubernetes Resources`
-1. Copy the External IP shown in the column for store-front
+1. Copy the External IP shown in the column for the `store-front` service
 1. Paste the IP into your browser and visit your store page
 
     :::image type="content" source="./learn/media/quick-kubernetes-deploy-cli/aks-store-application.png" alt-text="Screenshot of AKS Store sample application." lightbox="./learn/media/quick-kubernetes-deploy-cli/aks-store-application.png":::
 
+## Clean up resources
+
+Since you validated the application's functionality, you can now remove the cluster from the application. We will deploy the application again in the next tutorial.
+
+1. Stop and remove the container instances and resources using the [`docker-compose down`][docker-compose-down] command.
+
+    ```console
+    kubectl delete -f aks-store-quickstart.yaml
+    ```
+
+1. Check that all the application pods have been removed:
+
+    ```console
+    kubectl get pods
+    ```
+
 ## Next steps
 
 In this tutorial, you deployed a sample Azure application to a Kubernetes cluster in AKS. You learned how to:

articles/aks/tutorial-kubernetes-deploy-cluster.md

@@ -2,7 +2,7 @@
 title: Kubernetes on Azure tutorial - Create an Azure Kubernetes Service (AKS) cluster
 description: In this Azure Kubernetes Service (AKS) tutorial, you learn how to create an AKS cluster and use kubectl to connect to the Kubernetes main node.
 ms.topic: tutorial
-ms.date: 02/14/2024
+ms.date: 06/10/2024
 author: schaffererin
 ms.author: schaffererin
 
@@ -18,7 +18,7 @@ Kubernetes provides a distributed platform for containerized applications. With
 In this tutorial, part three of seven, you deploy a Kubernetes cluster in AKS. You learn how to:
 
 > [!div class="checklist"]
-
+>
 > * Deploy an AKS cluster that can authenticate to an Azure Container Registry (ACR).
 > * Install the Kubernetes CLI, `kubectl`.
 > * Configure `kubectl` to connect to your AKS cluster.
@@ -98,15 +98,15 @@ For information about AKS resource limits and region availability, see [Quotas,
 
 To allow an AKS cluster to interact with other Azure resources, the Azure platform automatically creates a cluster identity. In this example, the cluster identity is [granted the right to pull images][container-registry-integration] from the ACR instance you created in the previous tutorial. To execute the command successfully, you need to have an **Owner** or **Azure account administrator** role in your Azure subscription.
 
-* Create an AKS cluster using the [`az aks create`][az aks create] command. The following example creates a cluster named *myAKSCluster* in the resource group named *myResourceGroup*. This resource group was created in the [previous tutorial][aks-tutorial-prepare-acr] in the *eastus* region.
+* Create an AKS cluster using the [`az aks create`][az aks create] command. The following example creates a cluster named *myAKSCluster* in the resource group named *myResourceGroup*. This resource group was created in the [previous tutorial][aks-tutorial-prepare-acr] in the *eastus* region. We will continue to use the environment variable, `$ACRNAME`, that we set in the [previous tutorial][aks-tutorial-prepare-acr]. If you do not have this environment variable set, set it now to the same value you used previously.
 
     ```azurecli-interactive
     az aks create \
         --resource-group myResourceGroup \
         --name myAKSCluster \
         --node-count 2 \
         --generate-ssh-keys \
-        --attach-acr <acrName>
+        --attach-acr $ACRNAME
     ```
 
     > [!NOTE]
@@ -121,7 +121,7 @@ To allow an AKS cluster to interact with other Azure resources, the Azure platfo
 * Create an AKS cluster using the [`New-AzAksCluster`][new-azakscluster] cmdlet. The following example creates a cluster named *myAKSCluster* in the resource group named *myResourceGroup*. This resource group was created in the [previous tutorial][aks-tutorial-prepare-acr] in the *eastus* region.
 
     ```azurepowershell-interactive
-    New-AzAksCluster -ResourceGroupName myResourceGroup -Name myAKSCluster -NodeCount 2 -GenerateSshKey -AcrNameToAttach <acrName>
+    New-AzAksCluster -ResourceGroupName myResourceGroup -Name myAKSCluster -NodeCount 2 -GenerateSshKey -AcrNameToAttach $ACRNAME
     ```
 
     > [!NOTE]
@@ -155,8 +155,8 @@ To avoid needing an **Owner** or **Azure account administrator** role, you can a
 
     ```output
     NAME                                STATUS   ROLES   AGE   VERSION
-    aks-nodepool1-19366578-vmss000002   Ready    agent   47h   v1.25.6
-    aks-nodepool1-19366578-vmss000003   Ready    agent   47h   v1.25.6
+    aks-nodepool1-19366578-vmss000000   Ready    agent   47h   v1.28.9
+    aks-nodepool1-19366578-vmss000001   Ready    agent   47h   v1.28.9
     ```
 
 ### [Azure PowerShell](#tab/azure-powershell)
@@ -177,8 +177,8 @@ To avoid needing an **Owner** or **Azure account administrator** role, you can a
 
     ```output
     NAME                                STATUS   ROLES   AGE   VERSION
-    aks-nodepool1-19366578-vmss000002   Ready    agent   47h   v1.25.6
-    aks-nodepool1-19366578-vmss000003   Ready    agent   47h   v1.25.6
+    aks-nodepool1-19366578-vmss000000   Ready    agent   47h   v1.28.9
+    aks-nodepool1-19366578-vmss000001   Ready    agent   47h   v1.28.9
     ```
 
 ### [Azure Developer CLI](#tab/azure-azd)
@@ -201,8 +201,8 @@ To avoid needing an **Owner** or **Azure account administrator** role, you can a
 
     ```output
     NAME                                STATUS   ROLES   AGE   VERSION
-    aks-nodepool1-19366578-vmss000002   Ready    agent   47h   v1.25.6
-    aks-nodepool1-19366578-vmss000003   Ready    agent   47h   v1.25.6
+    aks-nodepool1-19366578-vmss000000   Ready    agent   47h   v1.28.9
+    aks-nodepool1-19366578-vmss000001   Ready    agent   47h   v1.28.9
     ```
 
 [!INCLUDE [azd-login-ts](./includes/azd/azd-login-ts.md)]

articles/aks/tutorial-kubernetes-paas-services.md

@@ -2,7 +2,7 @@
 title: Kubernetes on Azure tutorial - Use PaaS services with an Azure Kubernetes Service (AKS) cluster
 description: In this Azure Kubernetes Service (AKS) tutorial, you learn how to use the Azure Service Bus service with your AKS cluster.
 ms.topic: tutorial
-ms.date: 10/23/2023
+ms.date: 06/10/2024
 ms.custom: mvc, devx-track-azurecli, devx-track-azurepowershell
 #Customer intent: As a developer, I want to learn how to use PaaS services with an Azure Kubernetes Service (AKS) cluster so that I can deploy and manage my applications.
 ---
@@ -289,7 +289,7 @@ In previous tutorials, you used a RabbitMQ container to store orders submitted b
     kubectl get service store-front
     ```
 
-2. Navigate to the external IP address of the `store-front` service in your browser.
+2. Navigate to the external IP address of the `store-front` service in your browser using `http://<external-ip>`.
 3. Place an order by choosing a product and selecting **Add to cart**.
 4. Select **Cart** to view your order, and then select **Checkout**.
 

articles/aks/tutorial-kubernetes-prepare-acr.md

@@ -2,7 +2,7 @@
 title: Kubernetes on Azure tutorial - Create an Azure Container Registry and build images
 description: In this Azure Kubernetes Service (AKS) tutorial, you create an Azure Container Registry instance and upload sample application container images.
 ms.topic: tutorial
-ms.date: 11/28/2023
+ms.date: 06/10/2024
 author: schaffererin
 ms.author: schaffererin
 
@@ -69,6 +69,9 @@ Before creating an ACR instance, you need a resource group. An Azure resource gr
 2. Create an ACR instance using the [`New-AzContainerRegistry`][new-azcontainerregistry] cmdlet and provide your own unique registry name. The registry name must be unique within Azure and contain 5-50 alphanumeric characters. The rest of this tutorial uses an environment variable, `$ACRNAME`, as a placeholder for the container registry name. You can set this environment variable to your unique ACR name to use in future commands. The *Basic* SKU is a cost-optimized entry point for development purposes that provides a balance of storage and throughput.
 
     ```azurepowershell-interactive
+    $rand=New-Object System.Random
+    $RAND=$rand.Next()
+    $ACRNAME="myregistry$RAND" # Or replace with your own name
     New-AzContainerRegistry -ResourceGroupName myResourceGroup -Name $ACRNAME -Location eastus -Sku Basic
     ```
 

articles/aks/tutorial-kubernetes-prepare-app.md

@@ -2,7 +2,7 @@
 title: Kubernetes on Azure tutorial - Prepare an application for Azure Kubernetes Service (AKS)
 description: In this Azure Kubernetes Service (AKS) tutorial, you learn how to prepare and build a multi-container app with Docker Compose that you can then deploy to AKS.
 ms.topic: tutorial
-ms.date: 02/15/2023
+ms.date: 06/10/2024
 author: schaffererin
 ms.author: schaffererin
 
@@ -294,9 +294,9 @@ In the next tutorial, you learn how to create a cluster using the `azd` template
 
 <!-- LINKS - external -->
 [docker-compose]: https://docs.docker.com/compose/
-[docker-for-linux]: https://docs.docker.com/engine/installation/#supported-platforms
-[docker-for-mac]: https://docs.docker.com/docker-for-mac/
-[docker-for-windows]: https://docs.docker.com/docker-for-windows/
+[docker-for-linux]: https://docs.docker.com/desktop/install/linux-install/
+[docker-for-mac]: https://docs.docker.com/desktop/install/mac-install/
+[docker-for-windows]: https://docs.docker.com/desktop/install/windows-install/
 [docker-get-started]: https://docs.docker.com/get-started/
 [docker-images]: https://docs.docker.com/engine/reference/commandline/images/
 [docker-ps]: https://docs.docker.com/engine/reference/commandline/ps/

articles/aks/tutorial-kubernetes-scale.md

@@ -2,7 +2,7 @@
 title: Kubernetes on Azure tutorial - Scale applications in Azure Kubernetes Service (AKS)
 description: In this Azure Kubernetes Service (AKS) tutorial, you learn how to scale nodes and pods and implement horizontal pod autoscaling.
 ms.topic: tutorial
-ms.date: 03/05/2023
+ms.date: 06/10/2024
 author: schaffererin
 ms.author: schaffererin
 
@@ -160,18 +160,24 @@ The following example increases the number of nodes to three in the Kubernetes c
     Once the cluster successfully scales, your output will be similar to following example output:
 
     ```output
+    "aadProfile": null,
+    "addonProfiles": null,
     "agentPoolProfiles": [
       {
+        ...
         "count": 3,
-        "dnsPrefix": null,
-        "fqdn": null,
-        "name": "myAKSCluster",
-        "osDiskSizeGb": null,
+        "mode": "System",
+        "name": "nodepool1",
+        "osDiskSizeGb": 128,
+        "osDiskType": "Managed",
         "osType": "Linux",
         "ports": null,
-        "vmSize": "Standard_D2_v2",
+        "vmSize": "Standard_DS2_v2",
         "vnetSubnetId": null
+        ...
       }
+      ...
+    ]
     ```
 
 ### [Azure PowerShell](#tab/azure-powershell)
@@ -185,30 +191,24 @@ The following example increases the number of nodes to three in the Kubernetes c
     Once the cluster successfully scales, your output will be similar to following example output:
 
     ```output
-    ProvisioningState       : Succeeded
-    MaxAgentPools           : 100
-    KubernetesVersion       : 1.19.9
-    DnsPrefix               : myAKSCluster
-    Fqdn                    : myakscluster-000a0aa0.hcp.eastus.azmk8s.io
-    PrivateFQDN             :
-    AgentPoolProfiles       : {default}
-    WindowsProfile          : Microsoft.Azure.Commands.Aks.Models.PSManagedClusterWindowsProfile
-    AddonProfiles           : {}
-    NodeResourceGroup       : MC_myresourcegroup_myAKSCluster_eastus
-    EnableRBAC              : True
-    EnablePodSecurityPolicy :
-    NetworkProfile          : Microsoft.Azure.Commands.Aks.Models.PSContainerServiceNetworkProfile
-    AadProfile              :
-    ApiServerAccessProfile  :
-    Identity                :
-    LinuxProfile            : Microsoft.Azure.Commands.Aks.Models.PSContainerServiceLinuxProfile
-    ServicePrincipalProfile : Microsoft.Azure.Commands.Aks.Models.PSContainerServiceServicePrincipalProfile
-    Id                      : /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myresourcegroup/providers/Micros
-                          oft.ContainerService/managedClusters/myAKSCluster
-    Name                    : myAKSCluster
-    Type                    : Microsoft.ContainerService/ManagedClusters
-    Location                : eastus
-    Tags                    : {}
+    ...
+    ProvisioningState        : Succeeded
+    MaxAgentPools            : 100
+    KubernetesVersion        : 1.28
+    CurrentKubernetesVersion : 1.28.9
+    DnsPrefix                : myAKSCluster
+    Fqdn                     : myakscluster-000a0aa0.hcp.eastus.azmk8s.io
+    PrivateFQDN              :
+    AzurePortalFQDN          : myakscluster-000a0aa0.portal.hcp.eastus.azmk8s.io
+    AgentPoolProfiles        : {default}
+    ...
+    ResourceGroupName        : myResourceGroup
+    Id                       : /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/Mic
+                               rosoft.ContainerService/managedClusters/myAKSCluster
+    Name                     : myAKSCluster
+    Type                     : Microsoft.ContainerService/ManagedClusters
+    Location                 : eastus
+    Tags                     :
     ```
 
 ---