Skip to content

Commit 706f521

Browse files
Merge pull request #3317 from MicrosoftDocs/main638621894209846328sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 5037094 + d692dc4 commit 706f521

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
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:

0 commit comments

Comments
 (0)