Merge pull request #211755 from allyford/WindowsServer2022

WS2022 and gmsa GA updates

Author: JamesJBarnett

articles/aks/index.yml

@@ -135,16 +135,16 @@ landingContent:
             url: /security/benchmark/azure/baselines/aks-security-baseline?context=%2Fazure%2Faks%2Fcontext%2Faks-context
       - linkListType: how-to-guide
         links:
+          - text: Upgrade from Windows Server 2019 to 2022
+            url: /azure/aks/upgrade-windows-2019-2022
           - text: Create Dockerfiles for Windows Server containers
             url: /virtualization/windowscontainers/manage-docker/manage-windows-dockerfile?context=%2Fazure%2Faks%2Fcontext%2Faks-context 
           - text: Optimize Dockerfiles for Windows Server containers
             url: /virtualization/windowscontainers/manage-docker/optimize-windows-dockerfile?context=%2Fazure%2Faks%2Fcontext%2Faks-context
           - text: Use HostProcess containers
             url: use-windows-hpc.md
-          - text: Enable Calico network policies
-            url: use-network-policies.md#create-an-aks-cluster-for-calico-network-policies
-          - text: Enable GMSA
-            url: use-group-managed-service-accounts.md
+          - text: Enable network policies
+            url: /azure/aks/use-network-policies
           - text: Use Azure disks CSI drivers
             url: azure-disk-csi.md#windows-containers
           - text: Use Azure files CSI drivers

articles/aks/learn/quick-windows-container-deploy-cli.md

@@ -80,7 +80,7 @@ To run an AKS cluster that supports node pools for Windows Server containers, yo
 > [!NOTE]
 > To ensure your cluster to operate reliably, you should run at least 2 (two) nodes in the default node pool.
 
-Create a username to use as administrator credentials for the Windows Server nodes on your cluster. The following commands prompt you for a username and sets it to *WINDOWS_USERNAME* for use in a later command (remember that the commands in this article are entered into a BASH shell).
+Create a username to use as administrator credentials for the Windows Server nodes on your cluster. The following commands prompt you for a username and set it to *WINDOWS_USERNAME* for use in a later command (remember that the commands in this article are entered into a BASH shell).
 
 ```azurecli-interactive
 echo "Please enter the username to use as administrator credentials for Windows Server nodes on your cluster: " && read WINDOWS_USERNAME
@@ -124,44 +124,10 @@ az aks nodepool add \
 
 The above command creates a new node pool named *npwin* and adds it to the *myAKSCluster*. The above command also uses the default subnet in the default vnet created when running `az aks create`.
 
-## Add a Windows Server 2022 node pool (preview)
+## Add a Windows Server 2022 node pool
 
 When creating a Windows node pool, the default operating system will be Windows Server 2019. To use Windows Server 2022 nodes, you will need to specify an OS SKU type of `Windows2022`.
 
-[!INCLUDE [preview features callout](../includes/preview/preview-callout.md)]
-
-### Install the `aks-preview` extension
-
-You also need the *aks-preview* Azure CLI extension version `0.5.68` or later. Install the *aks-preview* Azure CLI extension by using the [az extension add][az-extension-add] command, or install any available updates by using the [az extension update][az-extension-update] command.
-
-```azurecli-interactive
-# Install the aks-preview extension
-az extension add --name aks-preview
-# Update the extension to make sure you have the latest version installed
-az extension update --name aks-preview
-```
-
-### Register the `AKSWindows2022Preview` preview feature
-
-To use the feature, you must also enable the `AKSWindows2022Preview` feature flag on your subscription.
-
-Register the `AKSWindows2022Preview` feature flag by using the [az feature register][az-feature-register] command, as shown in the following example:
-
-```azurecli-interactive
-az feature register --namespace "Microsoft.ContainerService" --name "AKSWindows2022Preview"
-```
-
-It takes a few minutes for the status to show *Registered*. Verify the registration status by using the [az feature list][az-feature-list] command:
-
-```azurecli-interactive
-az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/AKSWindows2022Preview')].{Name:name,State:properties.state}"
-```
-
-When ready, refresh the registration of the *Microsoft.ContainerService* resource provider by using the [az provider register][az-provider-register] command:
-
-```azurecli-interactive
-az provider register --namespace Microsoft.ContainerService
-```
 > [!NOTE]
 > Windows Server 2022 requires Kubernetes version "1.23.0" or higher.
 

articles/aks/windows-faq.md

@@ -16,7 +16,7 @@ This article outlines some of the frequently asked questions and OS concepts for
 
 ## Which Windows operating systems are supported?
 
-AKS uses Windows Server 2019 as the host OS version and only supports process isolation. Container images built by using other Windows Server versions are not supported. For more information, see [Windows container version compatibility][windows-container-compat].
+AKS uses Windows Server 2019 and Windows Server 2022 as the host OS version and only supports process isolation. Container images built by using other Windows Server versions are not supported. For more information, see [Windows container version compatibility][windows-container-compat].
 
 ## Is Kubernetes different on Windows and Linux?
 
@@ -135,7 +135,7 @@ Yes, an ingress controller that supports Windows Server containers can run on Wi
 
 ## Can my Windows Server containers use gMSA?
 
-Group-managed service account (gMSA) support is currently available in preview. See [Enable Group Managed Service Accounts (GMSA) for your Windows Server nodes on your Azure Kubernetes Service (AKS) cluster (Preview)](use-group-managed-service-accounts.md)
+Group-managed service account (gMSA) support is generally available for Windows on AKS. See [Enable Group Managed Service Accounts (GMSA) for your Windows Server nodes on your Azure Kubernetes Service (AKS) cluster](use-group-managed-service-accounts.md)
 
 ## Can I use Azure Monitor for containers with Windows nodes and containers?