Skip to content

Commit 6c59856

Browse files
Merge pull request #3655 from MicrosoftDocs/main638832891073790625sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 0497a56 + b0437ac commit 6c59856

8 files changed

+15
-15
lines changed

AKS-Arc/deploy-java-liberty-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ kubectl delete -f openlibertyapplication.yaml
249249

250250
For more information, see the references used in this guide:
251251

252-
* [Azure Kubernetes Service](https://azure.microsoft.com/free/services/kubernetes-service/)
252+
* [Azure Kubernetes Service](https://azure.microsoft.com/products/kubernetes-service)
253253
* [Open Liberty](https://openliberty.io/)
254254
* [Open Liberty Operator](https://github.com/OpenLiberty/open-liberty-operator)
255255
* [Open Liberty Server Configuration](https://openliberty.io/docs/ref/config/)

azure-local/release-information-23h2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The following tables summarize the release information for Azure Local across al
7676

7777
Starting in 2504, we offer two releases. One release provides the path to upgrade from 2503 to 2504. The other release supports a new deployment of 2504.
7878

79-
Starting with Azure Local 2503, you can discover and import update packages offline. To download the bundle and its SHA256 hash, see the **Download URI** column in the following table. For more information on how to import and discover update packages offline, see [Import and discover updates offline](./update/import-discover-updates-offline-23h2.md).
79+
Starting with Azure Local 2503, you can discover and import update packages for Azure Local with limited connectivity to Azure. To download the bundle and its SHA256 hash, see the **Download URI** column in the following table. For more information on how to import and discover update packages with limited connectivity, see [Update via PowerShell with limited connectivity](./update/import-discover-updates-offline-23h2.md).
8080

8181
#### [Existing deployments](#tab/existing-deployments)
8282

azure-local/upgrade/upgrade-22h2-to-23h2-other-methods.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via other method
33
description: Learn how to upgrade from Azure Stack HCI OS, version 22H2 to version 23H2 using other manual methods on Azure Local.
44
author: alkohli
55
ms.topic: how-to
6-
ms.date: 05/13/2025
6+
ms.date: 05/19/2025
77
ms.author: alkohli
88
ms.reviewer: alkohli
99
ms.service: azure-local
@@ -47,7 +47,7 @@ Before you begin, make sure that:
4747
- The system is registered in Azure.
4848
- All the machines in your Azure Local are healthy and show as **Online**.
4949
- You shut down virtual machines (VMs). We recommend shutting down VMs before performing the OS upgrade to prevent unexpected outages and damages to databases.
50-
- You have access to the Azure Stack HCI OS, version 23H2 software update. This update is available via Windows Update or as a downloadable media. The media is an ISO file that you can download from the [Azure portal](https://portal.azure.com/#view/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/~/hciGetStarted).
50+
- You have access to the Azure Stack HCI OS, version 23H2 software update. This update is available via Windows Update or as a downloadable media. The media must be version **2503** ISO that you can download from the [Azure portal](https://portal.azure.com/#view/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/~/hciGetStarted).
5151
- You have access to a client that can connect to your Azure Local. This client should be running PowerShell 5.0 or later.
5252
- You run the repair registration cmdlet:
5353

azure-local/upgrade/upgrade-22h2-to-23h2-powershell.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via PowerShell
33
description: Learn how to use PowerShell to upgrade Azure Stack HCI OS, version 22H2 to version 23H2.
44
author: alkohli
55
ms.topic: how-to
6-
ms.date: 05/13/2025
6+
ms.date: 05/19/2025
77
ms.author: alkohli
88
ms.reviewer: alkohli
99
ms.service: azure-local
@@ -46,7 +46,7 @@ Before you begin, make sure that:
4646
- The system is registered in Azure.
4747
- All the machines in your Azure Local, version 22H2 instance are healthy and show as **Online**.
4848
- You shut down virtual machines (VMs). We recommend shutting down VMs before performing the OS upgrade to prevent unexpected outages and damages to databases.
49-
- You have access to the Azure Stack HCI, version 23H2 OS software update for Azure Local. This update is available via Windows Update or as a downloadable media. The media is an ISO file that you can download from the [Azure portal](https://portal.azure.com/#view/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/~/hciGetStarted).
49+
- You have access to the Azure Stack HCI, version 23H2 OS software update for Azure Local. This update is available via Windows Update or as a downloadable media. The media must be version **2503** ISO file that you can download from the [Azure portal](https://portal.azure.com/#view/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/~/hciGetStarted).
5050
- You have access to a client that can connect to your Azure Local instance. This client should be running PowerShell 5.0 or later.
5151
- You run the repair registration cmdlet:
5252

@@ -66,7 +66,7 @@ Before you begin, make sure that:
6666
Consult with your hardware vendor for assistance if required.
6767

6868
> [!NOTE]
69-
> The ISO file is only required if the machines do not have access to Windows Update to download the OS feature update. If using this method, after you [Connect to Azure Local, version 22H2](#step-1-connect-to-azure-local), skip to step 6 under [Step 2: Install new OS using PowerShell](#step-2-install-new-os-using-powershell) and perform the remaining steps.
69+
> The **2503** ISO file is only required if the machines do not have access to Windows Update to download the OS feature update. If using this method, after you [Connect to Azure Local, version 22H2](#step-1-connect-to-azure-local), skip to step 6 under [Step 2: Install new OS using PowerShell](#step-2-install-new-os-using-powershell) and perform the remaining steps.
7070
> Use of 3rd party tools to install upgrades is not supported.
7171
7272
## Step 0: Update registry keys

azure-local/upgrade/upgrade-22h2-to-23h2-windows-admin-center.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via Windows Admi
33
description: Learn how to upgrade Azure Stack HCI OS, version 22H2 to version 23H2 using Windows Admin Center.
44
author: alkohli
55
ms.topic: how-to
6-
ms.date: 05/13/2025
6+
ms.date: 05/19/2025
77
ms.author: alkohli
88
ms.reviewer: alkohli
99
ms.service: azure-local
@@ -45,7 +45,7 @@ Before you begin, make sure that:
4545
- The system is registered in Azure.
4646
- All the machines in your Azure Local are healthy and show as **Online**.
4747
- You shut down virtual machines (VMs). We recommend shutting down VMs before performing the OS upgrade to prevent unexpected outages and damages to databases.
48-
- You have access to the Azure Stack HCI OS, version 23H2 software update. This update is available via Windows Update or as a downloadable media. The media is an ISO file that you can download from the [Azure portal](https://portal.azure.com/#view/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/~/hciGetStarted).
48+
- You have access to the Azure Stack HCI OS, version 23H2 software update. This update is available via Windows Update or as a downloadable media. The media must be version **2503** ISO that you can download from the [Azure portal](https://portal.azure.com/#view/Microsoft_Azure_HybridCompute/AzureArcCenterBlade/~/hciGetStarted).
4949
- You have access to a client that can connect to your Azure Local instance. This client should have Windows Admin Center installed on it. For more information, see [Install Windows Admin Center](/windows-server/manage/windows-admin-center/deploy/install).
5050
- You run the repair registration cmdlet:
5151

@@ -65,7 +65,7 @@ Before you begin, make sure that:
6565
Consult with your hardware vendor for assistance if required.
6666

6767
> [!NOTE]
68-
> The offline ISO upgrade method is not available when using Windows Admin Center. For these steps, see [Upgrade the operating system on Azure Local via PowerShell](./upgrade-22h2-to-23h2-powershell.md)
68+
> The offline **2503** ISO upgrade method is not available when using Windows Admin Center. For these steps, see [Upgrade the operating system on Azure Local via PowerShell](./upgrade-22h2-to-23h2-powershell.md)
6969
7070
## Step 0: Update registry keys
7171

azure-stack/mdc/operator/azure-stack-manage-basics-tzl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ These services require more configuration before you can make them available to
5151

5252
### Service roadmap
5353

54-
Azure Stack Hub will continue to add support for Azure services. For the projected roadmap, see the [Azure Stack Hub: An extension of Azure](https://azure.microsoft.com/resources/videos/azure-friday-azure-stack-an-extension-of-azure/) whitepaper. You can also monitor the [Azure Stack Hub blog posts](https://azure.microsoft.com/blog/tag/azure-stack-technical-preview) for new announcements.
54+
Azure Stack Hub will continue to add support for Azure services. See the [Azure Stack Hub product page](https://azure.microsoft.com/products/azure-stack/hub/). You can also monitor the [Azure Stack Hub blog posts](https://techcommunity.microsoft.com/category/azure/blog/azurestackblog) for new announcements.
5555

5656
## What account should I use?
5757

azure-stack/operator/azure-stack-manage-basics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ These services require additional configuration before you can make them availab
4646

4747
### Service roadmap
4848

49-
Azure Stack Hub continues to add support for Azure services. For the projected roadmap, see the [Azure Stack Hub: An extension of Azure](https://azure.microsoft.com/resources/videos/azure-friday-azure-stack-an-extension-of-azure/) whitepaper. You can also monitor the [Azure Stack Hub blog posts](https://techcommunity.microsoft.com/t5/azure-stack-blog/bg-p/AzureStackBlog) for new announcements.
49+
Azure Stack Hub continues to add support for Azure services. For the projected roadmap, see the [Azure Stack Hub: An extension of Azure](https://azure.microsoft.com/products/azure-stack/hub/) whitepaper. You can also monitor the [Azure Stack Hub blog posts](https://techcommunity.microsoft.com/t5/azure-stack-blog/bg-p/AzureStackBlog) for new announcements.
5050

5151
## What account should I use?
5252

azure-stack/user/kubernetes-aks-engine-release-notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ You can find the supported Kubernetes versions for AKS Engine on Azure Stack Hub
127127
| [v0.80.2](https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.80.2) | [AKS Base Ubuntu 20.04-LTS Image Distro (2024.032.1)](https://github.com/Azure/aks-engine-azurestack/blob/v0.80.2/vhd/release-notes/aks-engine-ubuntu-2004/aks-engine-azurestack-ubuntu-2004_2024.032.1.txt), [AKS Base Windows Server 2019 Image Containerd (17763.5329.20240321)](https://github.com/Azure/aks-engine-azurestack/blob/v0.80.2/vhd/release-notes/aks-windows-2019-containerd/2019-datacenter-core-azurestack-ctrd-17763.5329.20240321.txt) | 1.27.10**, 1.28.6** | API Model Samples ([Linux](https://github.com/Azure/aks-engine-azurestack/blob/96b45e116aef6ae2e5031561b0e10621ae86a068/examples/azure-stack/kubernetes-azurestack.json), [Windows](https://github.com/Azure/aks-engine-azurestack/blob/96b45e116aef6ae2e5031561b0e10621ae86a068/examples/azure-stack/kubernetes-windows.json)) |
128128
| [v0.80.3](https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.80.3) | [AKS Base Ubuntu 20.04-LTS Image Distro (2024.032.1)](https://github.com/Azure/aks-engine-azurestack/blob/v0.80.2/vhd/release-notes/aks-engine-ubuntu-2004/aks-engine-azurestack-ubuntu-2004_2024.032.1.txt), [AKS Base Windows Server 2019 Image Containerd (17763.5329.20240321)](https://github.com/Azure/aks-engine-azurestack/blob/v0.80.2/vhd/release-notes/aks-windows-2019-containerd/2019-datacenter-core-azurestack-ctrd-17763.5329.20240321.txt) | 1.27.10**, 1.28.6** | API Model Samples ([Linux](https://github.com/Azure/aks-engine-azurestack/blob/96b45e116aef6ae2e5031561b0e10621ae86a068/examples/azure-stack/kubernetes-azurestack.json), [Windows](https://github.com/Azure/aks-engine-azurestack/blob/96b45e116aef6ae2e5031561b0e10621ae86a068/examples/azure-stack/kubernetes-windows.json)) |
129129
| [v0.81.1](https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.81.1) | [AKS Base Ubuntu 20.04-LTS Image Distro (2024.311.1)](https://github.com/Azure/aks-engine-azurestack/blob/master/vhd/release-notes/aks-engine-ubuntu-2004/aks-engine-azurestack-ubuntu-2004_2024.311.1.txt), [AKS Base Windows Server 2019 Image Containerd (17763.6414.20243111)](https://github.com/Azure/aks-engine-azurestack/blob/master/vhd/release-notes/aks-windows-2019-containerd/2019-datacenter-core-azurestack-ctrd-17763.6414.20243111.txt) | 1.28.15**, 1.29.10** | API Model Samples ([Linux](https://github.com/Azure/aks-engine-azurestack/blob/0ea7973bb1826b7607086d4741b73313d72ce256/examples/azure-stack/kubernetes-azurestack.json), [Windows](https://github.com/Azure/aks-engine-azurestack/blob/0ea7973bb1826b7607086d4741b73313d72ce256/examples/azure-stack/kubernetes-windows.json)) |
130-
| [v0.82.1](https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.82.1) | [AKS Base Ubuntu 22.04-LTS Image Distro (2025.079.2)](https://github.com/Azure/aks-engine-azurestack/blob/master/vhd/release-notes/aks-engine-ubuntu-2204/aks-engine-azurestack-ubuntu-2204_2025.079.2.txt), [AKS Base Windows Server 2019 Image Containerd (17763.7009.20250792)](https://github.com/Azure/aks-engine-azurestack/blob/master/vhd/release-notes/aks-windows-2019-containerd/2019-datacenter-core-azurestack-ctrd-17763.7009.20250792.txt) | 1.29.15**, 1.30.10** | API Model Samples ([Linux](https://github.com/Azure/aks-engine-azurestack/blob/master/examples/azure-stack/kubernetes-azurestack.json), [Windows](https://github.com/Azure/aks-engine-azurestack/blob/master/examples/azure-stack/kubernetes-windows.json)) |
130+
| [v0.82.1](https://github.com/Azure/aks-engine-azurestack/releases/tag/release-v0.82.1) | [AKS Base Ubuntu 22.04-LTS Image Distro (2025.079.2)](https://github.com/Azure/aks-engine-azurestack/blob/master/vhd/release-notes/aks-engine-ubuntu-2204/aks-engine-azurestack-ubuntu-2204_2025.079.2.txt), [AKS Base Windows Server 2019 Image Containerd (17763.7009.20250792)](https://github.com/Azure/aks-engine-azurestack/blob/master/vhd/release-notes/aks-windows-2019-containerd/2019-datacenter-core-azurestack-ctrd-17763.7009.20250792.txt) | 1.29.15**, 1.30.10** | API Model Samples ([Linux](https://github.com/Azure/aks-engine-azurestack/blob/master/examples/azure-stack/kubernetes-azurestack.json), [Windows](https://github.com/Azure/aks-engine-azurestack/blob/master/examples/azure-stack/kubernetes-windows.json)) |
131131

132132
> [!NOTE]
133133
> *Starting from Kubernetes v1.21, only the [Cloud Provider for Azure](https://github.com/Azure/aks-engine-azurestack/blob/master/docs/topics/azure-stack.md#cloud-provider-for-azure) is supported on Azure Stack Hub.
@@ -143,7 +143,7 @@ The AKS engine `upgrade` command fully automates the upgrade process of your clu
143143

144144
- Added support for Kubernetes 1.29.15 and 1.30.10.
145145
- AKS Engine release v0.82.1 on Azure Stack Hub offers Ubuntu 22.04 LTS as its Linux base image. Starting with this release, Ubuntu 20.04 is no longer supported.
146-
- You can find other features at [the v0.82.1 GitHub page](https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.82.1).
146+
- You can find other features at [the v0.82.1 GitHub page](https://github.com/Azure/aks-engine-azurestack/releases/tag/release-v0.82.1).
147147

148148
### What's new with AKSe 0.76.0
149149

@@ -205,7 +205,7 @@ The following list is the complete set of release notes for Azure and Azure Stac
205205
- https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.80.2
206206
- https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.80.3
207207
- https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.81.1
208-
- https://github.com/Azure/aks-engine-azurestack/releases/tag/v0.82.1
208+
- https://github.com/Azure/aks-engine-azurestack/releases/tag/release-v0.82.1
209209

210210
::: moniker-end
211211

0 commit comments

Comments
 (0)