Skip to content

Commit 0fa976b

Browse files
authored
Merge pull request #257254 from schaffererin/akstutorialseriesedits
Minor updates to typos and errors in tutorial series
2 parents 58708c6 + a1b8cb8 commit 0fa976b

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
> [!NOTE]
2-
> If no patch is specified, the cluster will automatically be upgraded to the specified minor version's latest GA patch. For example, setting `--kubernetes-version` to `1.21` will result in the cluster upgrading to `1.21.9`.
32
>
4-
> When upgrading by alias minor version, only a higher minor version is supported. For example, upgrading from `1.20.x` to `1.20` will not trigger an upgrade to the latest GA `1.20` patch, but upgrading to `1.21` will trigger an upgrade to the latest GA `1.21` patch.
3+
> 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`.
4+
>
5+
> 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Kubernetes on Azure tutorial - Deploy an application to Azure Kubernetes Service (AKS)
33
description: In this Azure Kubernetes Service (AKS) tutorial, you deploy a multi-container application to your cluster using images stored in Azure Container Registry.
44
ms.topic: tutorial
5-
ms.date: 10/23/2023
5+
ms.date: 11/02/2023
66
ms.custom: mvc
77
#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.
88
---
@@ -173,7 +173,7 @@ In this tutorial, you deployed a sample Azure application to a Kubernetes cluste
173173
In the next tutorial, you learn how to use PaaS services for stateful workloads in Kubernetes.
174174
175175
> [!div class="nextstepaction"]
176-
> Use PaaS services for stateful workloads in AKS
176+
> [Use PaaS services for stateful workloads in AKS][aks-tutorial-paas]
177177
178178
<!-- LINKS - external -->
179179
[kubectl-apply]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#apply

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Kubernetes on Azure tutorial - Create an Azure Container Registry and build images
33
description: In this Azure Kubernetes Service (AKS) tutorial, you create an Azure Container Registry instance and upload sample application container images.
44
ms.topic: tutorial
5-
ms.date: 10/23/2023
5+
ms.date: 11/02/2023
66
ms.custom: mvc, devx-track-azurecli, devx-track-azurepowershell
77

88
#Customer intent: As a developer, I want to learn how to create and use a container registry so that I can deploy my own applications to Azure Kubernetes Service.
@@ -38,6 +38,9 @@ This tutorial requires Azure PowerShell version 5.9.0 or later. Run `Get-Install
3838

3939
Before creating an ACR instance, you need a resource group. An Azure resource group is a logical container into which you deploy and manage Azure resources.
4040

41+
> [!IMPORTANT]
42+
> This tutorial uses *myResourceGroup* as a placeholder for the resource group name. If you want to use a different name, replace *myResourceGroup* with your own resource group name.
43+
4144
### [Azure CLI](#tab/azure-cli)
4245

4346
1. Create a resource group using the [`az group create`][az-group-create] command.
@@ -46,10 +49,10 @@ Before creating an ACR instance, you need a resource group. An Azure resource gr
4649
az group create --name myResourceGroup --location eastus
4750
```
4851
49-
2. Create an ACR instance using the [`az acr create`][az-acr-create] command 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 `<acrName>` as a placeholder for the container registry name. The *Basic* SKU is a cost-optimized entry point for development purposes that provides a balance of storage and throughput.
52+
2. Create an ACR instance using the [`az acr create`][az-acr-create] command 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.
5053
5154
```azurecli-interactive
52-
az acr create --resource-group myResourceGroup --name <acrName> --sku Basic
55+
az acr create --resource-group myResourceGroup --name $ACRNAME --sku Basic
5356
```
5457
5558
### [Azure PowerShell](#tab/azure-powershell)
@@ -60,10 +63,10 @@ Before creating an ACR instance, you need a resource group. An Azure resource gr
6063
New-AzResourceGroup -Name myResourceGroup -Location eastus
6164
```
6265
63-
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 `<acrName>` as a placeholder for the container registry name. The *Basic* SKU is a cost-optimized entry point for development purposes that provides a balance of storage and throughput.
66+
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.
6467
6568
```azurepowershell-interactive
66-
New-AzContainerRegistry -ResourceGroupName myResourceGroup -Name <acrName> -Location eastus -Sku Basic
69+
New-AzContainerRegistry -ResourceGroupName myResourceGroup -Name $ACRNAME -Location eastus -Sku Basic
6770
```
6871
6972
---
@@ -76,9 +79,9 @@ Before creating an ACR instance, you need a resource group. An Azure resource gr
7679
> In the following example, we don't build the `rabbitmq` image. This image is available from the Docker Hub public repository and doesn't need to be built or pushed to your ACR instance.
7780
7881
```azurecli-interactive
79-
az acr build --registry <acrName> --image aks-store-demo/product-service:latest ./src/product-service/
80-
az acr build --registry <acrName> --image aks-store-demo/order-service:latest ./src/order-service/
81-
az acr build --registry <acrName> --image aks-store-demo/store-front:latest ./src/store-front/
82+
az acr build --registry $ACRNAME --image aks-store-demo/product-service:latest ./src/product-service/
83+
az acr build --registry $ACRNAME --image aks-store-demo/order-service:latest ./src/order-service/
84+
az acr build --registry $ACRNAME --image aks-store-demo/store-front:latest ./src/store-front/
8285
```
8386
8487
## List images in registry
@@ -88,7 +91,7 @@ Before creating an ACR instance, you need a resource group. An Azure resource gr
8891
* View the images in your ACR instance using the [`az acr repository list`][az-acr-repository-list] command.
8992
9093
```azurecli-interactive
91-
az acr repository list --name <acrName> --output table
94+
az acr repository list --name $ACRNAME --output table
9295
```
9396
9497
The following example output lists the available images in your registry:
@@ -106,7 +109,7 @@ Before creating an ACR instance, you need a resource group. An Azure resource gr
106109
* View the images in your ACR instance using the [`Get-AzContainerRegistryRepository`][get-azcontainerregistryrepository] cmdlet.
107110
108111
```azurepowershell-interactive
109-
Get-AzContainerRegistryRepository -RegistryName <acrName>
112+
Get-AzContainerRegistryRepository -RegistryName $ACRNAME
110113
```
111114
112115
The following example output lists the available images in your registry:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Kubernetes on Azure tutorial - Upgrade an Azure Kubernetes Service (AKS) cluster
33
description: In this Azure Kubernetes Service (AKS) tutorial, you learn how to upgrade an existing AKS cluster to the latest available Kubernetes version.
44
ms.topic: tutorial
5-
ms.date: 10/23/2023
5+
ms.date: 11/02/2023
66
ms.custom: mvc, devx-track-azurepowershell, event-tier1-build-2022
77
#Customer intent: As a developer or IT pro, I want to learn how to upgrade an Azure Kubernetes Service (AKS) cluster so that I can use the latest version of Kubernetes and features.
88
---
@@ -360,3 +360,4 @@ For more information on AKS, see the [AKS overview][aks-intro]. For guidance on
360360
[aks-auto-upgrade]: ./auto-upgrade-cluster.md
361361
[auto-upgrade-node-image]: ./auto-upgrade-node-image.md
362362
[node-image-upgrade]: ./node-image-upgrade.md
363+
[az-aks-update]: /cli/azure/aks#az_aks_update

0 commit comments

Comments
 (0)