Merge pull request #269220 from schaffererin/custom-kubelet-and-gen-2-ga-2

Custom kubelet and gen 2 VM GA - New PR

Author: prmerger-automator[bot]

articles/aks/cluster-configuration.md

@@ -62,63 +62,25 @@ Additionally, not all VM images support Gen2 VMs. On AKS, Gen2 VMs use [AKS Ubun
 
 Gen2 VMs are supported on Linux. Gen2 VMs on Windows are supported for WS2022 only.
 
-### Generation 2 virtual machines on Windows (preview)
+### Generation 2 virtual machines on Windows
 
-[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
+#### Limitations
 
 * Generation 2 VMs are supported on Windows for WS2022 only.
 * Generation 2 VMs are default for Windows clusters greater than or equal to Kubernetes 1.25.
-  * If your Kubernetes version is greater than 1.25, you only need to set the `vm_size` to get the generation 2 node pool. You can still use WS2019 generation 1 if you define that in the `os_sku`.
-  * If your Kubernetes version is less than 1.25, you can set the `os_sku` to WS2022 and set the `vm_size` to generation 2 to get the generation 2 node pool.
-
-#### Install the aks-preview Azure CLI extension
-
-* Install or update the aks-preview Azure CLI extension using the [`az extension add`][az-extension-add] or the [`az extension update`][az-extension-update] command.
-
-    ```azurecli
-    # Install the aks-preview extension
-    az extension add --name aks-preview
-
-    # Update to the latest version of the aks-preview extension
-    az extension update --name aks-preview
-    ```
-
-#### Register the AKSWindows2022Gen2Preview feature flag
-
-1. Register the AKSWindows2022Gen2Preview feature flag using the [`az feature register`][az-feature-register] command.
-
-    ```azurecli-interactive
-    az feature register --namespace "Microsoft.ContainerService" --name "AKSWindows2022Gen2Preview"
-    ```
-
-    It takes a few minutes for the status to show *Registered*.
-
-2. Verify the registration using the [`az feature show`][az-feature-show] command.
-
-    ```azurecli-interactive
-    az feature show --namespace "Microsoft.ContainerService" --name "AKSWindows2022Gen2Preview"
-    ```
-
-3. When the status reflects *Registered*, refresh the registration of the `Microsoft.ContainerService` resource provider using the [`az provider register`][az-provider-register] command.
-
-    ```azurecli-interactive
-    az provider register --namespace "Microsoft.ContainerService"
-    ```
+* If you select a vm size which supports both Gen 1 and Gen 2, the default for windows node pools will be Gen 1. To specify Gen 2, use custom header `UseWindowsGen2VM=true`.
 
 #### Add a Windows node pool with a generation 2 VM
 
 * Add a node pool with generation 2 VMs on Windows using the [`az aks nodepool add`][az-aks-nodepool-add] command.
 
     ```azurecli
-    # Sample command
-    az aks nodepool add --resource-group myResourceGroup --cluster-name myAKSCluster --name gen2np 
-    --kubernetes-version 1.23.5 --node-vm-size Standard_D32_v4 --os-type Windows --os-sku Windows2022
-
-    # Default command
-    az aks nodepool add --resource-group myResourceGroup --cluster-name myAKSCluster --name gen2np --os-type Windows --kubernetes-version 1.23.5
+    az aks nodepool add --resource-group myResourceGroup --cluster-name myAKSCluster --name gen2np --node-vm-size Standard_D32_v4 --os-type Windows --aks-custom-headers UseWindowsGen2VM=true
     ```
 
-* Determine whether you're on generation 1 or generation 2 using the [`az aks nodepool show`][az-aks-nodepool-show] command, and check that the `nodeImageVersion` contains `gen2`.
+The above example will create a WS2022 node pool with a Gen 2 VM. If you're using a vm size which only supports Gen 2, you do not need to add the custom header. If you're using a kubernetes version where Windows Server 2022 is not default, you need to specify `--os-sku`.  
+
+* Check whether you're using generation 1 or generation 2 using the [`az aks nodepool show`][az-aks-nodepool-show] command, and check that the `nodeImageVersion` contains `gen2`.
 
     ```azurecli
     az aks nodepool show

articles/aks/custom-node-configuration.md

@@ -14,47 +14,10 @@ Customizing your node configuration allows you to adjust operating system (OS) s
 
 ## Create an AKS cluster with a customized node configuration
 
-[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
-
-### Prerequisites for Windows kubelet custom configuration (preview)
-
-Before you begin, make sure you have an Azure account with an active subscription. If you don't have one, [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F). You also need to register the feature flag using the following steps:
-
-
-1. Install the aks-preview extension using the [`az extension add`][az-extension-add] command.
-
-    ```azurecli
-    az extension add --name aks-preview
-    ```
-
-2. Update to the latest version of the extension using the [`az extension update`][az-extension-update] command.
-
-    ```azurecli
-    az extension update --name aks-preview
-    ```
-
-3. Register the `WindowsCustomKubeletConfigPreview` feature flag using the [`az feature register`][az-feature-register] command.
-
-    ```azurecli-interactive
-    az feature register --namespace "Microsoft.ContainerService" --name "WindowsCustomKubeletConfigPreview"
-    ```
-
-    It takes a few minutes for the status to show *Registered*.
-
-4. Verify the registration status using the [`az feature show`][az-feature-show] command.
-
-    ```azurecli-interactive
-    az feature show --namespace "Microsoft.ContainerService" --name "WindowsCustomKubeletConfigPreview"
-    ```
-
-5. When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider using the [`az provider register`][az-provider-register] command.
-
-    ```azurecli-interactive
-    az provider register --namespace Microsoft.ContainerService
-    ```
-
 ### Create config files
 
+OS and kubelet configuration changes require you to create a new configuration file with the parameters and your desired settings. If a value for a parameter is not specified, then the value will be set to the default.
+
 #### Kubelet configuration
 
 ### [Linux node pools](#tab/linux-node-pools)
@@ -197,7 +160,7 @@ Kubelet custom configuration is supported for Linux and Windows node pools. Supp
 | `containerLogMaxFiles` | ≥ 2 | 5 | The maximum number of container log files that can be present for a container. |
 | `podMaxPids` | -1 to kernel PID limit | -1 (∞)| The maximum amount of process IDs that can be running in a Pod |
 
-#### Windows Kubelet custom configuration (preview)
+#### Windows Kubelet custom configuration
 
 | Parameter | Allowed values/interval | Default | Description |
 | --------- | ----------------------- | ------- | ----------- |

articles/azure-monitor/containers/container-insights-data-collection-dcr.md

@@ -87,7 +87,7 @@ The **Collected data** option allows you to select the tables that are populated
 
 > [!NOTE]
 > Minimum version required for Azure CLI is 2.51.0.
-    - For AKS clusters, [aks-preview](../../aks/cluster-configuration.md#install-the-aks-preview-azure-cli-extension) version 0.5.147 or higher
+    - For AKS clusters, [aks-preview](../../aks/cluster-configuration.md) version 0.5.147 or higher
     - For Arc enabled Kubernetes and AKS hybrid, [k8s-extension](../../azure-arc/kubernetes/extensions.md#prerequisites) version 1.4.3 or higher
 
 ## AKS cluster