Merge pull request #274238 from schaffererin/userstory251383

Jill Grant · web-flow · commit d30816075095 · 2024-05-03T15:13:59.000-06:00
Generation 2 VM GA and updates
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -4004,6 +4004,11 @@
 			"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
 			"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
 			"redirect_document_id":false
-		}
+		},
+        {
+            "source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
+            "redirect_url":"/azure/aks/generation-2-vm",
+            "redirect_document_id":false
+        }
     ]
 }
diff --git a/articles/aks/TOC.yml b/articles/aks/TOC.yml
@@ -290,6 +290,8 @@
               href: manage-node-pools.md
             - name: Reduce image pull time with Artifact Streaming on AKS
               href: artifact-streaming.md
+            - name: Use generation 2 VMs
+              href: generation-2-vm.md
             - name: Add an Azure Spot node pool
               href: spot-node-pool.md
             - name: Node pool snapshot
@@ -766,8 +768,6 @@
           href: use-windows-hpc.md
         - name: Upgrade from Windows Server 2019 to 2022
           href: upgrade-windows-2019-2022.md
-        - name: Use generation 2 VMs
-          href: generation-2-vm-windows.md
         - name: Create Dockerfiles for Windows Server containers
           href: /virtualization/windowscontainers/manage-docker/manage-windows-dockerfile?context=/azure/aks/context/aks-context
         - name: Optimize Dockerfiles for Windows Server containers
diff --git a/articles/aks/generation-2-vm-windows.md b/articles/aks/generation-2-vm-windows.md
diff --git a/articles/aks/generation-2-vm.md b/articles/aks/generation-2-vm.md
@@ -0,0 +1,91 @@
+---
+title: Use Generation 2 virtual machines in Azure Kubernetes Service (AKS)
+description: Learn how to use Generation 2 virtual machines on Windows and Linux node pools in Azure Kubernetes Service (AKS).
+ms.topic: article
+ms.custom: azure-kubernetes-service
+ms.date: 05/03/2024
+ms.author: schaffererin
+author: schaffererin
+---
+
+# Use generation 2 virtual machines in Azure Kubernetes Service (AKS)
+
+Azure supports [Generation 2 (Gen 2) virtual machines (VMs)](../virtual-machines/generation-2.md). Generation 2 VMs support key features not supported in Generation 1 (Gen 1) VMs, including increased memory, Intel Software Guard Extensions (Intel SGX), and virtualized persistent memory (vPMEM).
+
+Generation 2 VMs use the new UEFI-based boot architecture rather than the BIOS-based architecture used by Generation 1 VMs. Only specific SKUs and sizes support Generation 2 VMs. Check the [list of supported sizes](../virtual-machines/generation-2.md#generation-2-vm-sizes) to see if your SKU supports or requires Generation 2.
+
+Additionally, not all VM images support Generation 2 VMs. On AKS, Generation 2 VMs use the AKS Ubuntu 22.04 or 18.04 image or the AKS Windows Server 2022 image. These images support all Generation 2 SKUs and sizes.
+
+## Default behavior for supported vm sizes
+
+There are three scenarios when creating a node pool with a supported VM size:
+
+1. If the VM size supports only Generation 1, the default behavior for both Linux and Windows node pools is to use the Generation 1 node image.
+2. If the VM size supports only Generation 2, the default behavior for both Linux and Windows node pools is to use the Generation 2 node image.
+3. If the VM size supports both Generation 1 and Generation 2, the default behavior for Linux and Windows differs. Linux uses the Generation 2 node image, and Windows uses Generation 1 image. To use the Generation 2 node image, see [Create a Windows node pool with a Generation 2 VM](#create-a-node-pool-with-a-generation-2-vm).
+
+## Check available Generation 2 VM sizes
+
+Check available Generation 2 VM sizes using the [`az vm list-skus`][az-vm-list-skus] command.
+
+```azurecli-interactive
+az vm list-skus --location <location> --size <vm-size> --output table
+```
+
+## Create a node pool with a Generation 2 VM
+
+### [Linux node pool](#tab/linux-node-pool)
+
+By default, Linux uses the Generation 2 node image unless the VM size doesn't support Generation 2.
+
+Create a Linux node pool with a Generation 2 VM using the default [node pool creation][create-node-pools] process.
+
+### [Windows node pool](#tab/windows-node-pool)
+
+By default, Windows uses the Generation 1 node image unless the VM size doesn't support Generation 1.
+
+Create a Windows node pool with a Generation 2 VM using the [`az aks nodepool add`][az-aks-nodepool-add] command. To specify that you want to use Generation 2, add a custom header `--aks-custom-headers UseWindowsGen2VM=true`. Generation 2 VM also requires Windows Server 2022.
+
+```azurecli-interactive
+az aks nodepool add --resource-group <resource-group-name> --cluster-name <cluster-name> --name <node-pool-name> --vm-size <supported-generation-2-vm-size> --os-type Windows --os-sku Windows2022 --aks-custom-headers UseWindowsGen2VM=true
+```
+
+---
+
+## Update an existing node pool to use a Generation 2 VM
+
+### [Linux node pool](#tab/linux-node-pool)
+
+If you're using a VM size that only supports Generation 1, you can update your node pool to a vm size that supports Generation 2 using the [`az aks nodepool update`][az-aks-nodepool-update] command. This update changes your node image from Generation 1 to Generation 2.
+
+```azurecli-interactive
+az aks nodepool update --resource-group <resource-group-name> --cluster-name <cluster-name> --name <node-pool-name> --vm-size <supported-generation-2-vm-size> --os-type Linux
+```
+
+### [Windows node pool](#tab/windows-node-pool)
+
+If you're using a Generation 1 image, you can update your node pool to use Generation 2 by selecting a VM size that supports Generation 2 using the [`az aks nodepool update`][az-aks-nodepool-update] command. To specify that you want to use Generation 2, add a custom header `--aks-custom-headers UseWindowsGen2VM=true`. Generation 2 VM also requires Windows Server 2022. This update changes your node image from Generation 1 to Generation 2.
+
+```azurecli-interactive
+az aks nodepool update --resource-group <resource-group-name> --cluster-name <cluster-name> --name <node-pool-name> --vm-size <supported-generation-2-vm-size> --os-type Windows --os-sku Windows2022 --aks-custom-headers UseWindowsGen2VM=true
+```
+---
+
+## Check if you're using a Generation 2 node image
+
+Verify a successful node pool creation using the [`az aks nodepool show`][az-aks-nodepool-show] command and check that the `nodeImageVersion` contains `gen2` in the output.
+
+```azurecli-interactive
+az aks nodepool show --resource-group <resource-group-name> --cluster-name <cluster-name> --name <node-pool-name>
+```
+
+## Next steps
+
+To learn more about Generation 2 VMs, see [Support for Generation 2 VMs on Azure](../virtual-machines/generation-2.md).
+
+<!-- LINKS -->
+[az-aks-nodepool-add]: /cli/azure/aks/nodepool#az_aks_nodepool_add
+[az-aks-nodepool-show]: /cli/azure/aks/nodepool#az_aks_nodepool_show
+[az-aks-nodepool-update]: /cli/azure/aks/nodepool#az_aks_nodepool_update
+[create-node-pools]: ./create-node-pools.md
+[az-vm-list-skus]: /cli/azure/vm#az_vm_list_skus
diff --git a/articles/aks/windows-vs-linux-containers.md b/articles/aks/windows-vs-linux-containers.md
@@ -36,9 +36,9 @@ This article covers important considerations to keep in mind when using Windows
 | [AKS Image Cleaner][aks-image-cleaner] | Not supported. |
 | [BYOCNI][byo-cni] | Not supported. |
 | [Open Service Mesh][open-service-mesh] | Not supported. |
-| [GPU][gpu] | Not supported. |
+| [GPU][windows-gpu] | Supported in preview. |
 | [Multi-instance GPU][multi-instance-gpu] | Not supported. |
-| [Generation 2 VMs (preview)][gen-2-vms] | Supported in preview. |
+| [Generation 2 VMs (preview)][gen-2-vms] | Supported but not by default. |
 | [Custom node config][custom-node-config] | • Custom node config has two configurations:<br/> • [kubelet][custom-kubelet-parameters]: Supported in preview.<br/> • OS config: Not supported. |
 
 ## Next steps
@@ -60,9 +60,9 @@ For more information on Windows containers, see the [Windows Server containers F
 [node-image-upgrade]: node-image-upgrade.md
 [byo-cni]: use-byo-cni.md
 [open-service-mesh]: open-service-mesh-about.md
-[gpu]: gpu-cluster.md
+[windows-gpu]: use-windows-gpu.md
 [multi-instance-gpu]: gpu-multi-instance.md
-[gen-2-vms]: cluster-configuration.md#generation-2-virtual-machines
+[gen-2-vms]: generation-2-vm.md
 [custom-node-config]: custom-node-configuration.md
 [custom-kubelet-parameters]: custom-node-configuration.md#kubelet-custom-configuration
 

Original file line number	Diff line number	Diff line change
`@@ -4004,6 +4004,11 @@`
`4004`	`4004`	`"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",`
`4005`	`4005`	`"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",`
`4006`	`4006`	`"redirect_document_id":false`
`4007`		`- }`
	`4007`	`+ },`
	`4008`	`+ {`
	`4009`	`+ "source_path_from_root":"/articles/aks/generation-2-vm-windows.md",`
	`4010`	`+ "redirect_url":"/azure/aks/generation-2-vm",`
	`4011`	`+ "redirect_document_id":false`
	`4012`	`+ }`
`4008`	`4013`	`]`
`4009`	`4014`	`}`