Merge pull request #3610 from MicrosoftDocs/main638805241773221691sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

azure-local/upgrade/about-upgrades-23h2.md

@@ -3,7 +3,7 @@ title: About Azure Local upgrade to version 23H2
 description: Learn how to upgrade from Azure Local, version 22H2 to Azure Local, version 23H2.
 author: alkohli
 ms.topic: conceptual
-ms.date: 02/28/2025
+ms.date: 04/17/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -70,7 +70,7 @@ Azure Local upgrade supports the following services and workloads:
 
 | Workload/Configuration | Currently supported |
 |--|--|
-| Azure Kubernetes (AKS) on Azure Local | See notes <br> Kubernetes versions are incompatible between the *old* and *new* Azure Local versions. <br> Remove AKS and all the settings from AKS enabled by Azure Arc before you apply the solution upgrade. |
+| Azure Kubernetes (AKS) on Azure Local | See notes <br> Kubernetes versions are incompatible between the *old* and *new* Azure Local versions. <br> Before applying the solution upgrade, wait for the solution upgrade banner to appear on your Azure Local resource page. Then, remove AKS and all the settings from AKS enabled by Azure Arc. |
 | Arc VMs on Azure Local | See notes <br> Preview versions of Arc VMs can't be upgraded. |
 | Stretched clusters on Azure Local | Yes <br> You must upgrade to Azure Stack HCI OS, version 23H2 to maintain your cluster in a supported state. <br> The solution upgrade isn't applicable for stretched clusters. |
 | System Center Virtual Machine Manager (SCVMM) | Yes <br> If your Azure Local instance running version 22H2 is managed by SCVMM 2025, the OS upgrade is supported. |

azure-local/upgrade/install-solution-upgrade.md

@@ -21,7 +21,7 @@ This article describes how to install the solution upgrade on your Azure Local i
 Throughout this article, we refer to OS version 23H2 as the *new* version and version 22H2 as the *old* version.
 
 > [!IMPORTANT]
-> While the OS upgrade is generally available, the solution upgrade will have a phased rollout.
+> While the OS upgrade is generally available, the solution upgrade is rolled out in phases. Additionally, the solution upgrade isn't available to customers in Azure China.
 
 ## Prerequisites
 
@@ -43,7 +43,8 @@ Before you install the solution upgrade, make sure that you:
 You install the solution upgrade via the Azure portal.
 
 > [!IMPORTANT]
-> Microsoft only supports upgrade applied from **Azure Local** resource page. Use of 3rd party tools to install upgrades is not supported.
+> - Microsoft only supports upgrade applied from Azure Local resource page. Use of 3rd party tools to install upgrades is not supported.
+> - If you have Azure Kubernetes Service (AKS) workloads on Azure Local, wait for the solution upgrade banner to appear on the Azure Local resource page. Then, remove AKS and all AKS hybrid settings before you apply the solution upgrade.
 
 Follow these steps to install the solution upgrade:
 

azure-local/upgrade/validate-solution-upgrade-readiness.md

@@ -3,7 +3,7 @@ title: Validate solution upgrade readiness for Azure Local, version 23H2
 description: Learn how to assess upgrade readiness for Azure Local, version 23H2 that already had its operating system upgraded from version 22H2.
 author: alkohli
 ms.topic: how-to
-ms.date: 02/28/2025
+ms.date: 04/17/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -418,13 +418,19 @@ Make sure that the cluster functional level and storage pool version are up to d
 
 ## Remediation 10: Check the MOC install state
 
-If you were running AKS workloads on your Azure Local, you must remove Azure Kubernetes Service and all the settings from AKS enabled by Azure Arc before you apply the solution upgrade. Kubernetes versions are incompatible between the *old* and *new* versions of Azure Local. Additionally, Preview versions of Arc VMs can't be updated.
+Follow these steps to apply solution upgrade if you're running Azure Kubernetes Service (AKS) workloads on your Azure Local:
+
+1. Wait for the solution upgrade banner to appear on your Azure Local resource page.
+1. Remove AKS and all the settings from AKS hybrid before you apply the solution upgrade. Kubernetes versions are incompatible between the *old* and *new* versions of Azure Local. Additionally, preview versions of Azure Local VMs enabled by Azure Arc can't be updated.
 
 For more information, see [Uninstall-Aks-Hci for AKS enabled by Azure Arc](/azure/aks/hybrid/reference/ps/uninstall-akshci).
 
 ## Remediation 11: Check the AKS install state
 
-If you were running AKS workloads on your Azure Local, you must remove Azure Kubernetes Service and all the settings from AKS hybrid before you apply the solution upgrade. Kubernetes versions are incompatible between the *old* and *new* versions of Azure Local.
+Follow these steps to apply solution upgrade if you're running AKS workloads on your Azure Local:
+
+1. Wait for the solution upgrade banner to appear on your Azure Local resource page.
+1. Remove AKS and all the settings from AKS hybrid before you apply the solution upgrade. Kubernetes versions are incompatible between the *old* and *new* versions of Azure Local.
 
 For more information, see [Uninstall-Aks-Hci for AKS enabled by Azure Arc](/azure/aks/hybrid/reference/ps/uninstall-akshci).