Resolving merge conflict.

Author: LouisBerner

AKS-Arc/TOC.yml

@@ -133,6 +133,8 @@
             href: kubernetes-monitor-object-events.md
           - name: Get kubelet logs
             href: aks-get-kubelet-logs.md
+          - name: Monitor control plane metrics
+            href: control-plane-metrics.md
           - name: Enable Container Insights
             href: /azure/azure-monitor/containers/kubernetes-monitoring-enable
           - name: Monitor Kubernetes audit events
@@ -149,24 +151,31 @@
       href: aks-troubleshoot.md
     - name: Control plane configuration validation errors
       href: control-plane-validation-errors.md
-    - name: Connectivity issues with MetalLB
-      href: load-balancer-issues.md 
     - name: K8sVersionValidation error
       href: cluster-k8s-version.md
     - name: Use diagnostic checker
       href: aks-arc-diagnostic-checker.md
     - name: KubeAPIServer unreachable error
       href: kube-api-server-unreachable.md
-    - name: Can't see VM SKUs on Azure portal
-      href: check-vm-sku.md
-    - name: Deleted AKS Arc cluster still visible on Azure portal
-      href: deleted-cluster-visible.md
+    - name: Can't create/scale AKS cluster due to image issues
+      href: gallery-image-not-usable.md
+    - name: Disk space exhaustion on control plane VMs
+      href: kube-apiserver-log-overflow.md
+    - name: Telemetry pod consumes too much memory and CPU  
+      href: telemetry-pod-resources.md
+    - name: Issues after deleting storage volumes
+      href: delete-storage-volume.md
     - name: Can't fully delete AKS Arc cluster with PodDisruptionBudget (PDB) resources
       href: delete-cluster-pdb.md
     - name: Azure Advisor upgrade recommendation
       href: azure-advisor-upgrade.md
-    - name: Issues after deleting storage volumes
-      href: delete-storage-volume.md
+    - name: Deleted AKS Arc cluster still visible on Azure portal
+      href: deleted-cluster-visible.md
+    - name: Can't see VM SKUs on Azure portal
+      href: check-vm-sku.md
+    - name: Connectivity issues with MetalLB
+      href: load-balancer-issues.md 
+
   - name: Reference
     items:
     - name: Azure CLI
@@ -331,6 +340,8 @@
         href: vnet.yml
 - name: AKS on Windows Server
   items:
+  - name: AKS on Windows Server retirement
+    href: aks-windows-server-retirement.md
   - name: Overview
     href: overview.md
   - name: System requirements

AKS-Arc/aks-create-clusters-cli.md

@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters in Azure Local using Azure
 ms.topic: how-to
 ms.custom: devx-track-azurecli
 author: sethmanheim
-ms.date: 02/18/2025
+ms.date: 03/31/2025
 ms.author: sethm 
 ms.lastreviewed: 01/25/2024
 ms.reviewer: guanghu
@@ -44,7 +44,7 @@ az extension add -n connectedk8s --upgrade
 
 ## Create a Kubernetes cluster
 
-Use the `az aksarc create` command to create a Kubernetes cluster in AKS Arc. Make sure you sign in to Azure before running this command. If you have multiple Azure subscriptions, select the appropriate subscription ID using the [az account set](/cli/azure/account#az-account-set) command.
+Use the [`az aksarc create`](/cli/azure/aksarc#az-aksarc-create) command to create a Kubernetes cluster in AKS Arc. Make sure you sign in to Azure before you run this command. If you have multiple Azure subscriptions, select the appropriate subscription ID using the [`az account set`](/cli/azure/account#az-account-set) command. With the  `az aksarc create` command, we recommend that you use the `--validate` flag, which validates the input parameters that you intend to use. Once the input parameters are validated, you can run the  `az aksarc create` command without the `--validate` flag to create the Kubernetes cluster. 
 
 ```azurecli
 az aksarc create -n $aksclustername -g $resource_group --custom-location $customlocationID --vnet-ids $logicnetId --aad-admin-group-object-ids $aadgroupID --generate-ssh-keys 

AKS-Arc/aks-edge-howto-scale-out.md

@@ -1,20 +1,26 @@
 ---
-title: AKS Edge Scale
+title: AKS Edge Essentials scale (preview)
 description: Learn how to scale out your AKS Edge Essentials applications to multiple nodes.
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 07/11/2024
+ms.date: 04/04/2025
 ms.custom: template-how-to, linux-related-content
 ---
 
-# Scaling out on multiple machines
+# Scale out on multiple machines (preview)
 
 Now that AKS Edge Essentials is installed on your primary machine, this article describes how you can scale out your cluster to other secondary machines to create a multi-machine deployment.
 
 > [!CAUTION]
 > Scaling to additional nodes is an experimental feature.
 
+> [!IMPORTANT]
+> AKS Edge Essentials multi-machine deployment is currently in PREVIEW.
+> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
+> Azure Kubernetes Service Edge Essentials previews are partially covered by customer support on a best-effort basis.
+
+
 ## Prerequisites
 
 - Set up your [scalable Kubernetes](aks-edge-howto-multi-node-deployment.md) cluster.

AKS-Arc/aks-networks.md

@@ -3,7 +3,7 @@ title: Create logical networks for Kubernetes clusters on Azure Local, version 2
 description: Learn how to create Arc-enabled logical networks for AKS.
 ms.topic: how-to
 author: sethmanheim
-ms.date: 03/21/2025
+ms.date: 04/01/2025
 ms.author: sethm 
 ms.lastreviewed: 04/01/2024
 ms.reviewer: abha
@@ -80,7 +80,7 @@ For static IP, the required parameters are as follows:
 | `--ip-allocation-method`   | The IP address allocation method. Supported values are `Static`. Usage: `--ip-allocation-method "Static"`. |
 | `--ip-pool-start`     | The start IP address of your IP pool. The address must be in range of the address prefix. Usage: `--ip-pool-start "10.220.32.18"`.  |
 | `--ip-pool-end`       | The end IP address of your IP pool. The address must be in range of the address prefix. Usage: `--ip-pool-end "10.220.32.38"`.  |
-| `--vlan`              | The VLAN ID. Usage: `--vlan 10`. This parameter is required, otherwise the default value of 0 results in an AKS Arc cluster creation failure.  |
+| `--vlan`              | The VLAN ID. Usage: `--vlan 10`. This parameter is optional. Specifies the VLAN ID (an int32 value) to use when creating the logical network.  |
 
 # [Azure portal](#tab/azureportal)
 

AKS-Arc/aks-troubleshoot.md

@@ -3,10 +3,10 @@ title: Troubleshoot common issues in AKS enabled by Azure Arc
 description: Learn about common issues and workarounds in AKS enabled by Arc.
 ms.topic: how-to
 author: sethmanheim
-ms.date: 02/28/2025
+ms.date: 04/01/2025
 ms.author: sethm 
-ms.lastreviewed: 02/27/2024
-ms.reviewer: guanghu
+ms.lastreviewed: 04/01/2025
+ms.reviewer: abha
 
 ---
 
@@ -20,18 +20,29 @@ To open a support request, see the [Get support](/azure/aks/hybrid/help-support)
 
 ## Known issues
 
-The following sections describe known issues and workarounds for AKS enabled by Azure Arc:
-
-- [Control plane configuration validation errors](control-plane-validation-errors.md)
-- [Connectivity issues with MetalLB](load-balancer-issues.md)
-- [K8sVersionValidation error](cluster-k8s-version.md)
-- [Use diagnostic checker](aks-arc-diagnostic-checker.md)
-- [KubeAPIServer unreachable error](kube-api-server-unreachable.md)
-- [Can't see VM SKUs on Azure portal](check-vm-sku.md)
-- [Deleted AKS Arc cluster still visible on Azure portal](deleted-cluster-visible.md)
-- [Can't fully delete AKS Arc cluster with PodDisruptionBudget (PDB) resources](delete-cluster-pdb.md)
-- [Azure Advisor upgrade recommendation message](azure-advisor-upgrade.md)
-- [Issues after deleting storage volume](delete-storage-volume.md)
+The following sections describe known issues for AKS enabled by Azure Arc:
+
+| AKS Arc CRUD operation | Issue | Fix status |
+|------------------------|-------|------------|
+| AKS cluster create     | [Can't create AKS cluster or scale node pool because of issues with AKS Arc images](gallery-image-not-usable.md) | Partially fixed in 2503 release |
+| AKS steady state       | [AKS Arc telemetry pod consumes too much memory and CPU](telemetry-pod-resources.md) | Active
+| AKS steady state       | [Disk space exhaustion on control plane VMs due to accumulation of kube-apiserver audit logs](kube-apiserver-log-overflow.md) | Active
+| AKS cluster delete     | [Deleted AKS Arc cluster still visible on Azure portal](deleted-cluster-visible.md) | Active |
+| AKS cluster delete     | [Can't fully delete AKS Arc cluster with PodDisruptionBudget (PDB) resources](delete-cluster-pdb.md) | Fixed in 2503 release |
+| Azure portal           | [Can't see VM SKUs on Azure portal](check-vm-sku.md) | Fixed in 2411 release |
+| MetalLB Arc extension  | [Connectivity issues with MetalLB](load-balancer-issues.md) | Fixed in 2411 release | 
+
+
+## Guides to diagnose and troubleshoot Kubernetes CRUD failures
+
+| AKS Arc operation | Issue | 
+|------------------------|-------|
+| Create validation      | [Control plane configuration validation errors](control-plane-validation-errors.md) 
+| Create validation      | [K8sVersionValidation error](cluster-k8s-version.md)   
+| Create validation      | [KubeAPIServer unreachable error](kube-api-server-unreachable.md)  
+| Network configuration issues | [Use diagnostic checker](aks-arc-diagnostic-checker.md)
+| Kubernetes steady state   | [Resolve issues due to out-of-band deletion of storage volumes](delete-storage-volume.md)
+| Release validation     | [Azure Advisor upgrade recommendation message](azure-advisor-upgrade.md)
 
 ## Next steps
 

AKS-Arc/aks-whats-new-23h2.md

@@ -2,11 +2,11 @@
 title: What's new in AKS on Azure Local, version 23H2
 description: Learn about what's new in AKS on Azure Local, version 23H2.
 ms.topic: overview
-ms.date: 11/19/2024
+ms.date: 04/01/2025
 author: sethmanheim
 ms.author: sethm 
 ms.reviewer: guanghu
-ms.lastreviewed: 06/25/2024
+ms.lastreviewed: 04/01/2025
 
 ---
 
@@ -42,6 +42,23 @@ By integrating these components, Azure Arc offers a unified and efficient Kubern
 
 This section lists the new features and improvements in AKS Arc in each release of Azure Local, version 23H2.
 
+### Release 2503
+
+The following Kubernetes cluster deployment and management capabilities are available:
+
+- **Large VM SKUs for Kubernetes nodepools**: Added two new VM SKUs - `Standard_D32s_v3`: 32 vCPU, 128 GiB and `Standard_D16s_v3`: 16 vCPU, 64 GiB - to support larger nodepools on an AKS cluster. For more information about supported VM sizes, see [supported scale options](scale-requirements.md).
+- **Improved log collection experience**: Improved log collection for AKS control plane node VMs and nodepool VMs, with support for passing multiple IP addresses and SSH key or directory path. For more information, see [on-demand log collection](get-on-demand-logs.md) and [az aksarc get-logs CLI](/cli/azure/aksarc#az-aksarc-get-logs).
+- **Improved diagnosability**: The [Diagnostic Checker tool](aks-arc-diagnostic-checker.md) is automatically run in case of Kubernetes cluster create failure, and added new test cases.
+- **Improved Kubernetes cluster delete**: Fixed deletion issues; for example, due to [pod disruption budgets](delete-cluster-pdb.md?tabs=aks-on-azure-local).
+- **Improved AKS Arc image download**: Fixed issues with AKS Arc image downloads.
+- **Improved GPU support**: Improved error handling for Kubernetes cluster creation with GPU enabled nodepools. Fixed known issues with attaching persistent volumes on GPU enabled nodepools.
+
+To get started with these features in the 2503 release, make sure to update your [AKSArc CLI extension](/cli/azure/aksarc) to version 1.5.37 or higher.
+
+#### Supported Kubernetes versions for 2503
+
+The Kubernetes versions supported in the 2503 release are: 1.28.12, 1.28.14, 1.29.7, 1.29.9, 1.30.3 and 1.30.4.
+
 ### Release 2411
 
 The following Kubernetes cluster deployment and management capabilities are available:

AKS-Arc/aks-windows-server-retirement.md

@@ -0,0 +1,92 @@
+---
+title: Retirement of AKS architecture on Windows Server 2019 and Windows Server 2022
+description: Learn about retirement of AKS on Windows Server 2019 and Windows Server 2022.
+ms.topic: how-to
+ms.custom: linux-related-content
+author: sethmanheim
+ms.author: sethm
+ms.date: 03/26/2025
+
+# Intent: As an IT Pro, I want to move my workloads from AKS on Windows Server to the latest version of AKS on Azure Local.
+# Keyword: retirement
+---
+
+# Announcing the 3-year retirement of AKS on Windows Server current architecture
+
+AKS enabled by Azure Arc uses Azure Arc to create new Kubernetes clusters on Azure Local directly from Azure. It enables you to use familiar tools such as the Azure portal, Azure CLI, Azure Resource Manager, and Bicep and Terraform templates to create and manage your Kubernetes clusters running on Azure Local. Microsoft continues to focus on delivering consistent user experience for all your AKS clusters. To continue ensuring Azure remains the best possible experience with the highest standards of safety and reliability, **we are retiring the current architecture of AKS on Windows Server 2019 and AKS on Windows Server 2022 in 3 years, on March 27, 2028**.
+
+## What is AKS on Azure Local?
+
+AKS on Azure Local uses Azure Arc to create new Kubernetes clusters on Azure Local directly from Azure. Since clusters are automatically connected to Azure Arc when they're created, you can use your Microsoft Entra ID for connecting to your clusters from anywhere. This ensures your developers and application operators can provision and configure Kubernetes clusters in accordance with company policies.
+
+The following Kubernetes cluster deployment and management capabilities are available:
+
+- **Pricing**: AKS is now included in Azure Local pricing, effective January 2025. This means that you only need to pay for Azure Local. There are no separate costs for running AKS clusters, including Linux and Windows node pools.
+- **Simplified infrastructure deployment on Azure Local**. Infrastructure components of AKS Arc like Arc Resource Bridge, Custom Location and the Kubernetes Extension for the AKS Arc operator, are all deployed as part of the Azure Local. The whole lifecycle management of AKS Arc infrastructure follows the same approach as the other components on Azure Local.
+- **Cloud-based management**: Create and manage Kubernetes clusters on Azure Local with familiar tools such as the Azure portal, Azure CLI, Azure Resource Manager, and Bicep and Terraform templates.
+- **Arc Gateway integration**: Deploy AKS Arc clusters with pod-level Arc Proxy and communicate with the Arc gateway, reducing the list of outbound URLs to configure in an isolated network environment.
+- **Integration with Entra ID and Azure RBAC**: Enable Azure RBAC for Kubernetes while creating AKS Arc clusters. Deploy AKS Arc clusters with workload identity enabled and deploy application pods with the workload identity label to access Microsoft Entra ID protected resources, such as Azure Key Vault.
+- **Support for NVIDIA T4**: Create Linux node pools in new VM sizes with GPU NVIDIA T4.
+- **K8s Audit Logs**: Export audit logs and other control plane logs to one or more destinations.
+- **Improved certificate management**: Shut down AKS Arc clusters for up to 7 days without any certificate expiration issues. Automatically repair certificates, managed by cert-tattoo, that expired when the cluster was shut down.
+
+## If you're using Azure Kubernetes Service on Windows Server 2019 or Windows Server 2022
+
+The Azure Kubernetes Service current architecture on Windows Server 2019 and Windows Server 2022 will be retired on 27 March 2028. Starting on March 27 2028, you no longer get support, security and quality updates for your existing Azure Kubernetes Service clusters. Additionally, you won't be able to deploy, upgrade or scale the current architecture of Azure Kubernetes Service on Windows Server 2019 and Windows Server 2022.
+
+## If you're using Azure Kubernetes Service on Azure Local, version 22H2
+
+If you're using AKS on Azure Local, version 22H2, be aware that Azure Local, version 22H2 will reach end of service on May 31 2025. After that, you won't receive monthly security and quality updates that provide protection from the latest security threats. To continue receiving updates, we recommend updating to the latest version of Azure Local.
+
+## Deploy AKS on Azure Local, version 23H2 or later
+
+### [From Windows Server 2019, 2022](#tab/ws)
+
+AKS on Azure Local has a dependency on deploying a supported version of Azure Local. This means that local, PowerShell, or Windows Admin Center commands such as `Update-AksHciCluster` that worked on Windows Server don't work on Azure Local, version 23H2 or later, since AKS deployments on Azure Local, version 23H2 or later are managed via Azure Resource Manager (Azure CLI, Azure portal, etc.).
+
+#### Evaluate if Azure Local is right for you
+
+[Compare Windows Server](/azure/azure-local/concepts/compare-windows-server) explains key differences between Azure Local and Windows Server and provides guidance on when to use each. Both products are actively supported and maintained by Microsoft. Many organizations choose to deploy both, as they are intended for different and complementary purposes.
+
+#### Uninstall AKS on Windows Server
+
+Before you move to Azure Local, follow these steps to disconnect AKS workload clusters from Azure Arc and then uninstall AKS:
+
+- Identify all your Arc-connected AKS workload clusters, and then [disconnect your AKS workload clusters from Azure Arc](connect-to-arc.md#disconnect-your-aks-cluster-from-azure-arc)
+- Uninstall AKS using [`Uninstall-AksHci`](/azure/aks/aksarc/reference/ps/uninstall-akshci). This removes all AKS-related configuration from Windows Server.
+
+#### Deploy a supported version of Azure Local
+
+[Deploy Azure Local from Azure portal or an Azure Resource Manager template](/azure/azure-local/deploy/deployment-introduction).
+
+#### Deploy an AKS cluster on Azure Local
+
+- [Review the networking pre-requisites](aks-hci-network-system-requirements.md) for deploying AKS on Azure Local.
+- [Deploy an AKS cluster on Azure Local using Az CLI, Azure portal and ARM templates, etc.](aks-create-clusters-cli.md).
+
+### [From Azure Local, version 22H2](#tab/22H2)
+
+AKS on Azure Local has a dependency on deploying a supported version of Azure Local. This means that local, PowerShell, or Windows Admin Center commands such as `Update-AksHciCluster` that worked on Azure Local, version 22H2 don't work on Azure Local, version 23H2 or later, since AKS deployments on Azure Local, version 23H2 or later are managed via Azure Resource Manager (Az CLI, Azure portal, etc).
+
+#### Uninstall AKS on Azure Local, version 22H2
+
+Before you upgrade to a supported version of Azure Local, follow these steps to disconnect AKS workload clusters from Azure Arc and then uninstall AKS:
+
+- Identify all your Arc-connected AKS workload clusters, and then [disconnect your AKS workload clusters from Azure Arc](connect-to-arc.md#disconnect-your-aks-cluster-from-azure-arc)
+- Uninstall AKS using [`Uninstall-AksHci`](/azure/aks/aksarc/reference/ps/uninstall-akshci). This removes all AKS-related configuration from Windows Server.
+
+#### Upgrade to a supported version of Azure Local
+
+[Upgrade Azure Local 22H2 to a supported version of Azure Local](/azure/azure-local/upgrade/about-upgrades-23h2).
+
+#### Deploy an AKS cluster on Azure Local
+
+- [Review the networking pre-requisites](aks-hci-network-system-requirements.md) for deploying AKS on Azure Local.
+- [Deploy an AKS cluster on Azure Local using Az CLI, Azure portal and ARM templates, etc.](aks-create-clusters-cli.md).
+
+---
+
+## Next steps
+
+- [Compare AKS deployment options](https://techcommunity.microsoft.com/blog/azurearcblog/comparing-feature-sets-for-aks-enabled-by-azure-arc-deployment-options/4188163).
+- [Compare Windows Server with Azure Local](/azure/azure-local/concepts/compare-windows-server)