Skip to content

Commit c80bd63

Browse files
author
Manika Dhiman
committed
Merge branch 'main' into md-upgrade-to-24h2
2 parents 01d506d + 1341b0f commit c80bd63

File tree

294 files changed

+964
-10441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+964
-10441
lines changed

‎.openpublishing.redirection.json

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,285 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "azure-local/release-information.md",
5+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "azure-local/manage/azure-benefits.md",
10+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "azure-local/concepts/system-requirements.md",
15+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "azure-local/deploy/download-software.md",
20+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "azure-local/deploy/operating-system.md",
25+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "azure-local/deploy/create-cluster.md",
30+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "azure-local/manage/witness.md",
35+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "azure-local/deploy/register-with-azure.md",
40+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "azure-local/deploy/validate.md",
45+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "azure-local/deploy/single-server.md",
50+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "azure-local/manage/single-node-scale-out.md",
55+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "azure-local/deploy/create-cluster-powershell.md",
60+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "azure-local/deploy/sdn-wizard.md",
65+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "azure-local/manage/sdn-express.md",
70+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "azure-local/deploy/branch-office-edge.md",
75+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "azure-local/deploy/virtual-desktop-infrastructure.md",
80+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "azure-local/deploy/sql-server.md",
85+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "azure-local/deploy/trusted-enterprise-virtualization.md",
90+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "azure-local/manage/windows-server-azure-edition.md",
95+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "azure-local/manage/upgrade-vm-windows-server-azure-edition.md",
100+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "azure-local/manage/create-stretched-volumes.md",
105+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "azure-local/manage/thin-provisioning.md",
110+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "azure-local/manage/thin-provisioning-conversion.md",
115+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path": "azure-local/manage/monitor-hci-single.md",
120+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path": "azure-local/manage/monitor-hci-multi.md",
125+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path": "azure-local/manage/monitor-cluster.md",
130+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path": "azure-local/manage/diskspd-overview.md",
135+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "azure-local/manage/configure-proxy-settings.md",
140+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "azure-local/manage/manage-cluster-registration.md",
145+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "azure-local/manage/cluster.md",
150+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "azure-local/manage/cluster-powershell.md",
155+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "azure-local/manage/update-cluster.md",
160+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "azure-local/manage/kernel-soft-reboot.md",
165+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "azure-local/manage/add-cluster.md",
170+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path": "azure-local/manage/convert-to-stretched-cluster.md",
175+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path": "azure-local/manage/maintain-servers.md",
180+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path": "azure-local/manage/languages.md",
185+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path": "azure-local/manage/change-privacy-settings.md",
190+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path": "azure-local/hybrid-capabilities-with-azure-services.md",
195+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path": "azure-local/manage/register-windows-admin-center.md",
200+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path": "azure-local/manage/azure-portal.md",
205+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path": "azure-local/manage/manage-default-network-access-policies-virtual-machines.md",
210+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path": "azure-local/deploy/troubleshoot-hci-registration.md",
215+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path": "azure-local/manage/validate-qos.md",
220+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path": "azure-local/manage/troubleshoot-credssp.md",
225+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path": "azure-local/manage/collect-diagnostic-data.md",
230+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path": "azure-local/concepts/single-server-clusters.md",
235+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path": "azure-local/concepts/stretched-clusters.md",
240+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path": "azure-local/concepts/nested-virtualization.md",
245+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
246+
"redirect_document_id": false
247+
},
248+
{
249+
"source_path": "azure-local/concepts/software-defined-networking.md",
250+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path": "azure-local/concepts/plan-software-defined-networking-infrastructure.md",
255+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path": "azure-local/concepts/network-controller.md",
260+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
261+
"redirect_document_id": false
262+
},
263+
{
264+
"source_path": "azure-local/concepts/updates.md",
265+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
266+
"redirect_document_id": false
267+
},
268+
{
269+
"source_path": "azure-local/concepts/security.md",
270+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
271+
"redirect_document_id": false
272+
},
273+
{
274+
"source_path": "azure-local/concepts/utility-applications.md",
275+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
276+
"redirect_document_id": false
277+
},
278+
{
279+
"source_path": "azure-local/concepts/data-collection.md",
280+
"redirect_url": "/azure/azure-local/overview?view=azloc-2504",
281+
"redirect_document_id": false
282+
},
3283
{
4284
"source_path":"azure-stack/operator/compare-azure-azure-stack.md",
5285
"redirect_url":"/azure-stack/operator/azure-stack-overview",

‎AKS-Arc/aks-edge-howto-secret-encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ If there are errors with the KMS plugin, follow this procedure:
9292
Repair-AksEdgeKms
9393
```
9494

95-
1. If you still encounter errors, contact [Microsoft Customer Support](aks-edge-troubleshoot-overview.md) and [collect logs](aks-get-kubelet-logs.md).
95+
1. If you still encounter errors, contact [Microsoft Customer Support](aks-edge-troubleshoot-overview.md) and [collect logs](aks-edge-resources-logs.md).
9696

9797
## Next steps
9898

‎AKS-Arc/azure-rbac-local.md

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ms.custom: devx-track-azurecli
66
author: sethmanheim
77
ms.author: sethm
88
ms.reviewer: leslielin
9-
ms.date: 02/21/2025
10-
ms.lastreviewed: 02/21/2025
9+
ms.date: 05/21/2025
10+
ms.lastreviewed: 05/21/2025
1111

1212
# Intent: As an IT Pro, I want to use Azure RBAC to authenticate connections to my AKS clusters over the Internet or on a private network.
1313
# Keyword: Kubernetes role-based access control AKS Azure RBAC AD
@@ -31,7 +31,7 @@ For a conceptual overview, see [Azure RBAC for Kubernetes Authorization](concept
3131
Before you begin, make sure you have the following prerequisites:
3232

3333
- AKS on Azure Local currently supports enabling Azure RBAC only during Kubernetes cluster creation. You can't enable Azure RBAC after the Kubernetes cluster is created.
34-
- Install the latest version of the **aksarc** and **connectedk8s** Azure CLI extensions. Note that you need to run the **aksarc** extension version 1.1.1 or later to enable Azure RBAC. Run `az --version` to find the current version. If you need to install or upgrade Azure CLI, see [Install Azure CLI](/cli/azure/install-azure-cli).
34+
- You can enable Azure RBAC using either Azure CLI or the Azure portal. To use Azure CLI, you must install the latest versions of the **aksarc** and **connectedk8s** Azure CLI extensions. Note that you need the **aksarc** extension version 1.1.1 or later to enable Azure RBAC. Run `az --version` to find the current version. If you need to install or upgrade Azure CLI, see [Install Azure CLI](/cli/azure/install-azure-cli).
3535

3636
```azurecli
3737
az extension add --name aksarc
@@ -67,18 +67,30 @@ Before you begin, make sure you have the following prerequisites:
6767
6868
You can create an Azure RBAC-enabled Kubernetes cluster for authorization and a Microsoft Entra ID for authentication.
6969
70+
### [Azure CLI](#tab/azurecli)
71+
7072
```azurecli
7173
az aksarc create -n $aks_cluster_name -g $resource_group_name --custom-location $customlocation_ID --vnet-ids $logicnet_Id --generate-ssh-keys --enable-azure-rbac
7274
```
7375

7476
After a few minutes, the command completes and returns JSON-formatted information about the cluster.
7577

78+
### [Azure portal](#tab/azureportal)
79+
80+
1. Go to **Kubernetes - Azure Arc**, select the **Add** icon, and then select **Create a Kubernetes cluster with Azure Arc**.
81+
1. Under the **Access** tab, locate the authentication and authorization settings. Select **Microsoft Entra Authentication with Azure RBAC**.
82+
1. Complete all other desired configurations for your cluster.
83+
1. Select **Review + create** to create the cluster.
84+
---
85+
7686
## Step 2: Create role assignments for users to access the cluster
7787

7888
[!INCLUDE [built-in-roles](includes/built-in-roles.md)]
7989

8090
You can use the [`az role assignment create`](/cli/azure/role/assignment#az-role-assignment-create) command to create role assignments.
8191

92+
### [Azure CLI](#tab/azurecli)
93+
8294
First, get the `$ARM-ID` for the target cluster to which you want to assign a role.
8395

8496
```azurecli
@@ -95,6 +107,13 @@ az role assignment create --role "Azure Arc Kubernetes Viewer" --assignee <assig
95107

96108
In this example, the scope is the Azure Resource Manager ID of the cluster. It can also be the resource group containing the Kubernetes cluster.
97109

110+
### [Azure portal](#tab/azureportal)
111+
112+
1. Go to **Azure Arc | Kubernetes clusters** and locate your Azure RBAC-enabled cluster for which you want to assign roles.
113+
1. Navigate to **Access control (IAM)**, select the **Add** icon, and then select **Add role assignment**. If the **Add role assignment** option is disabled, verify that Azure RBAC is enabled by checking **Settings > Properties > AAD profile > Enable Azure RBAC**.
114+
1. Follow the instructions to complete the role assignment.
115+
---
116+
98117
### Create custom role definitions
99118

100119
You can choose to create your own role definition for use in role assignments.

‎AKS-Arc/includes/supported-gpu-models.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
author: sethmanheim
33
ms.author: sethm
44
ms.topic: include
5-
ms.date: 04/14/2025
5+
ms.date: 06/02/2025
66
ms.reviewer: abha
7-
ms.lastreviewed: 04/14/2025
7+
ms.lastreviewed: 06/02/2025
88

99
---
1010

1111
## Supported GPU models
1212

13-
The following GPU models are supported by AKS on Azure Local.
13+
The following GPU models are supported by AKS on Azure Local. Note that GPUs are only supported on Linux OS node pools. GPUs are not supported on Windows OS node pools.
1414

1515
| Manufacturer | GPU model | Supported version |
1616
|--------------|-----------|-------------------|
@@ -45,4 +45,4 @@ The following VM sizes for each GPU model are supported by AKS on Azure Local.
4545
| Standard_NC4_A16 | 1 | 16 | 4 | 8 |
4646
| Standard_NC8_A16 | 1 | 16 | 8 | 16 |
4747
| Standard_NC16_A16 | 2 | 32 | 16 | 64 |
48-
| Standard_NC32_A16 | 2 | 32 | 32 | 128 |
48+
| Standard_NC32_A16 | 2 | 32 | 32 | 128 |

0 commit comments

Comments
 (0)