Skip to content

Commit 4240574

Browse files
committed
Sync release-hotfixes with main, fix merge
2 parents 139f8e9 + ea09a2b commit 4240574

File tree

11 files changed

+51
-30
lines changed

11 files changed

+51
-30
lines changed

AKS-Hybrid/aks-vmware-quickstart-deploy.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,16 @@ To complete this quickstart, you need to do these things:
8888
8989
## Step 3: Create the AKS cluster
9090

91-
Run the following command to create the cluster:
91+
Run the following command to create the cluster.
9292

9393
```azurecli
94-
az aksarc create -n '<name of your cluster>' -g $resource_group --kubernetes-version 'v1.26.6' --custom-location $custom_location --aad-admin-group-object-ids $aad_group_id --vnet-ids $vnet_id --control-plane-ip $control_plane_ip --generate-ssh-keys --debug
94+
az aksarc create -n '<name of your cluster>' -g $resource_group --kubernetes-version '<Kubernetes version from the Arc Resource Bridge>' --custom-location $custom_location --aad-admin-group-object-ids $aad_group_id --vnet-ids $vnet_id --control-plane-ip $control_plane_ip --generate-ssh-keys --debug
9595
```
9696

97+
> [!NOTE]
98+
> In this preview release, you can only deploy the same Kubernetes version that the Arc Resource Bridge supports. The Kubernetes version you provide in the command must align with the Arc Resource Bridge version. You can find the Arc Resource Bridge version in the Azure portal under **Azure Arc > Management > Resource Bridge**. To determine the corresponding Kubernetes version, see [What's new with Azure Arc resource bridge](/azure/azure-arc/resource-bridge/release-notes).
99+
100+
97101
## Next steps
98102

99103
- See [Supported deployment scale](aks-vmware-scale-requirements.md) for the different configuration options.

AKS-Hybrid/aks-vmware-system-requirements.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: System requirements and support matrix for AKS enabled by Azure Arc on VMware (preview)
33
description: Learn about system requirements and the support matrix for AKS enabled by Azure Arc on VMware.
4-
ms.date: 03/22/2024
4+
ms.date: 09/16/2024
55
ms.topic: conceptual
66
author: sethmanheim
77
ms.author: sethm
88
ms.reviewer: leslielin
9-
ms.lastreviewed: 03/22/2024
9+
ms.lastreviewed: 09/16/2024
1010

1111
ms.custom: references_regions
1212

@@ -70,15 +70,35 @@ You should create a folder for VM templates, to store the Arc Resource Bridge an
7070

7171
## Supported Kubernetes version
7272

73-
In this preview release, you can only deploy the same Kubernetes version that the Arc Resource Bridge supports. See the [Arc Resource Bridge release notes](https://github.com/Azure/ArcResourceBridge/releases) for information about which Kubernetes version is supported for each specific version number.
73+
In this preview release, you can only deploy the same Kubernetes version that the Arc Resource Bridge supports. You can find the Arc Resource Bridge version in the Azure portal under **Azure Arc > Management > Resource Bridge**. To determine the corresponding Kubernetes version, see [What's new with Azure Arc resource bridge](/azure/azure-arc/resource-bridge/release-notes).
7474

7575
## Custom location
7676

77-
If you choose to **Enable Kubernetes Service on VMware [preview]** when you **Connect vCenter to Azure** [from the Azure portal](/azure/azure-arc/vmware-vsphere/quick-start-connect-vcenter-to-arc-using-script), a custom location with the prefix **AKS-**, and a default namespace, are created for you to deploy AKS on VMware. If you **Enable Kubernetes Service on VMware [preview]** using the [Azure CLI process](aks-vmware-install-kubernetes-extension.md), you can specify the name of the custom location of your choice with the default namespace.
77+
If you choose to **Enable Kubernetes Service on VMware [preview]** when you **Connect vCenter to Azure** [from the Azure portal](/azure/azure-arc/vmware-vsphere/quick-start-connect-vcenter-to-arc-using-script), a custom location with the prefix **AKS-**, and a default namespace, are created for you to deploy AKS on VMware. If you enable the Azure Kubernetes Service on VMware using the [Azure CLI process](aks-vmware-install-kubernetes-extension.md), you can specify the name of the custom location of your choice with the default namespace.
7878

7979
> [!IMPORTANT]
8080
> You must use the **default** namespace.
8181
82+
To view the custom location namespace, use the `az customlocation show` command:
83+
84+
```azurecli
85+
az customlocation show -g $customLocationResourceGroupName -n $customLocationName
86+
```
87+
88+
If your custom location was not created with the **default** namespace, use the following command to delete the custom location and create a custom location with the default namespace. For more information about how to manage custom locations, see [Create and manage custom locations](/azure/azure-arc/kubernetes/custom-locations).
89+
90+
Delete the custom location:
91+
92+
```azurecli
93+
az customlocation delete -g $customLocationResourceGroupName -n $customLocationName
94+
```
95+
96+
Create the custom location with the **default** namespace:
97+
98+
```azurecli
99+
az customlocation create -g $customLocationResourceGroupName -n $customLocationName --cluster-extension-ids $clusteraksExtensionId --host-resource-id $ArcApplianceResourceId --namespace "default"
100+
```
101+
82102
## Azure requirements
83103

84104
You must connect to your Azure account:

azure-stack/hci/deploy/deployment-arc-register-server-permissions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ Before you begin, make sure you've completed the following prerequisites:
5757
> [!IMPORTANT]
5858
> Run these steps on every Azure Stack HCI server that you intend to cluster.
5959
60-
<!-- 1. Install the [Arc registration script](https://www.powershellgallery.com/packages/AzSHCI.ARCInstaller) from PSGallery.
60+
1. Install the [Arc registration script](https://www.powershellgallery.com/packages/AzSHCI.ARCInstaller) from PSGallery. **This step is only required if you're using an OS ISO that's older than 2408**. For more information, see [What's new in 2408](../whats-new.md#features-and-improvements-in-2408).
6161

6262
# [PowerShell](#tab/powershell)
6363
```powershell
6464
#Register PSGallery as a trusted repo
6565
Register-PSRepository -Default -InstallationPolicy Trusted
6666
6767
#Install required PowerShell modules in your node for registration
68-
Install-Module Az.Accounts -RequiredVersion 2.13.2
68+
Install-Module Az.Accounts -RequiredVersion 3.0.0
6969
Install-Module Az.Resources -RequiredVersion 6.12.0
70-
Install-Module Az.ConnectedMachine -RequiredVersion 0.5.2
70+
Install-Module Az.ConnectedMachine -RequiredVersion 0.8.0
7171
7272
7373
#Install Arc registration script from PSGallery
@@ -77,9 +77,9 @@ Before you begin, make sure you've completed the following prerequisites:
7777
Here's a sample output of the installation:
7878
7979
```output
80-
PS C:\Users\SetupUser> Install-Module Az.Accounts -RequiredVersion 2.13.2
80+
PS C:\Users\SetupUser> Install-Module Az.Accounts -RequiredVersion 3.0.0
8181
PS C:\Users\SetupUser> Install-Module Az.Resources -RequiredVersion 6.12.0
82-
PS C:\Users\SetupUser> Install-Module Az.ConnectedMachine -RequiredVersion 0.5.2
82+
PS C:\Users\SetupUser> Install-Module Az.ConnectedMachine -RequiredVersion 0.8.0
8383
PS C:\Users\SetupUser> Install-Module -Name AzSHCI.ARCInstaller
8484
NuGet provider is required to continue
8585
PowerShellGet requires NuGet provider version '2.8.5.201' or newer to interact with NuGet-based repositories. The NuGet provider must be available in 'C:\Program Files\PackageManagement\ProviderAssemblies' or
@@ -89,7 +89,7 @@ Before you begin, make sure you've completed the following prerequisites:
8989
[Y] Yes [N] No [S] Suspend [?] Help (default is "Y"): Y
9090
PS C:\Users\SetupUser>
9191
```
92-
--- -->
92+
9393
1. Set the parameters. The script takes in the following parameters:
9494
9595
|Parameters |Description |

azure-stack/hci/deploy/deployment-install-os.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ Follow these steps to configure the operating system using SConfig:
139139
> - Make sure that the local administrator password follows Azure password length and complexity requirements. Use a password that is at least 12 characters long and contains a lowercase character, an uppercase character, a numeral, and a special character.
140140
> - Do not join the servers with the Azure Stack HCI operating system installed, to the Active Directory domain prior to cloud deployment. Cluster nodes are automatically joined to a domain during the [Deployment via Azure portal](./deploy-via-portal.md).
141141
142-
<!--## Install required Windows roles
142+
## Install required Windows roles
143+
144+
**This step is only required if you're using an OS ISO that's older than 2408**. For more information, see [What's new in 2408](../whats-new.md#features-and-improvements-in-2408).
143145

144146
Install the Hyper-V role. Run the following command on each server of the cluster:
145147

@@ -149,10 +151,9 @@ Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
149151

150152
Your servers will restart; this takes a few minutes.
151153

152-
You are now ready to register the Azure Stack HCI server with Azure Arc and assign permissions for deployment. -->
154+
You are now ready to register the Azure Stack HCI server with Azure Arc and assign permissions for deployment.
153155

154156
## Next steps
155157

156158
- (Optional) [Configure proxy settings for Azure Stack HCI, version 23H2](../manage/configure-proxy-settings-23h2.md).
157-
- [Register Azure Stack HCI servers in your system with Azure Arc and assign permissions](./deployment-arc-register-server-permissions.md).
158-
159+
- [Register Azure Stack HCI servers in your system with Azure Arc and assign permissions](./deployment-arc-register-server-permissions.md).

azure-stack/hci/deploy/deployment-introduction.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.subservice: azure-stack-hci
1515

1616
This article is the first in the series of deployment articles that describe how to deploy Azure Stack HCI, version 23H2. This article applies to both single and multi-node deployments. The target audience for this article is IT administrators who are responsible for deploying Azure Stack HCI in their organization.
1717

18-
[!INCLUDE [important-23h2](../../includes/hci-important-deploy-23h2.md)]
19-
2018
## About deployment methods
2119

2220
In this release, you can deploy Azure Stack HCI using one of the following methods:

azure-stack/hci/manage/manage-arc-virtual-machines.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: alkohli
66
ms.topic: how-to
77
ms.service: azure-stack
88
ms.subservice: azure-stack-hci
9-
ms.date: 09/09/2024
9+
ms.date: 09/13/2024
1010
---
1111

1212
# Manage Arc VMs on Azure Stack HCI
@@ -15,7 +15,6 @@ ms.date: 09/09/2024
1515

1616
This article describes how to manage Arc virtual machines (VMs) running on Azure Stack HCI, version 23H2. The procedures to enable guest management, start, stop, restart, pause, save, or delete an Arc VM, are detailed.
1717

18-
1918
## Prerequisites
2019

2120
Before you begin, make sure to complete the following prerequisites:
@@ -34,10 +33,11 @@ There are two agents that are important to understand in the context of guest ma
3433

3534
When you enable guest management on an Arc VM, the guest agent installs the [Azure Connected Machine agent](/azure/azure-arc/servers/agent-overview). The Azure Connected Machine agent enables you to manage Azure Arc VM extensions on your Azure Stack HCI VM.
3635

37-
Based on whether a guest agent is running on your Arc VM, the steps to enable guest management are different.
36+
Here are some key considerations for enabling guest management on a VM after provisioning it:
3837

39-
> [!IMPORTANT]
40-
> Make sure that your Azure Stack HCI cluster is running 2311 or later to run this procedure.
38+
- Make sure that your Azure Stack HCI cluster is running 2311 or later.
39+
- Enabling guest management after VM provisioning isn't supported for Windows Server 2012 and Windows Server 2012 R2.
40+
- The steps to enable guest management differ based on whether a guest agent is running on your Arc VM.
4141

4242
### Verify if guest agent is running
4343

azure-stack/operator/release-notes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Stack Hub release notes
33
description: Release notes for Azure Stack Hub integrated systems, including updates and bug fixes.
44
author: sethmanheim
55
ms.topic: article
6-
ms.date: 09/06/2024
6+
ms.date: 09/13/2024
77
ms.author: sethm
88
ms.reviewer: rtiberiu
99
ms.lastreviewed: 04/22/2024
@@ -130,10 +130,10 @@ The Azure Stack Hub 2311 update build type is **Full**. This build contains only
130130

131131
The 2311 update has the following expected runtimes based on our internal testing:
132132

133-
- 4 nodes: 8-28 hours
134-
- 8 nodes: 11-30 hours
135-
- 12 nodes: 14-34 hours
136-
- 16 nodes: 17-40 hours
133+
- 4 nodes: 36-50 hours
134+
- 8 nodes: 36-50 hours
135+
- 12 nodes: 50-80 hours
136+
- 16 nodes: 50-90 hours
137137

138138
> [!IMPORTANT]
139139
> Disconnected environments have additional prerequisite steps, which might increase this duration. See the following section for required steps to obtain and update a SQL Server 2019 product key (PID).

azure-stack/user/azure-stack-storage-connect-se.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ Export and then import Azure Stack Hub certificate for disconnected integrated s
4949

5050
4. Under **Console Root\Certificated (Local Computer)\Trusted Root Certification Authorities\Certificates** find **AzureStackSelfSignedRootCert**.
5151

52-
![Load the Azure Stack Hub root certificate through mmc.exe](./media/azure-stack-storage-connect-se/add-certificate-azure-stack.png)
53-
5452
5. Right-click the certificate, select **All Tasks** > **Export**, and then follow the instructions to export the certificate with **Base-64 encoded X.509 (.CER)**.
5553

5654
The exported certificate will be used in the next step.
-53.4 KB
Loading
-32.4 KB
Loading

0 commit comments

Comments
 (0)