Skip to content

Commit dbc0d0c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-stack-docs-pr into deploy2502
2 parents cbb5625 + d7b43bc commit dbc0d0c

File tree

149 files changed

+1285
-3801
lines changed

Some content is hidden

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

149 files changed

+1285
-3801
lines changed

.openpublishing.publish.config.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"build_output_subfolder": "adaptive-cloud",
77
"locale": "en-us",
88
"monikers": [],
9+
"moniker_ranges": [],
910
"open_to_public_contributors": false,
1011
"type_mapping": {
1112
"Conceptual": "Content"
@@ -29,14 +30,12 @@
2930
"template_folder": "_themes"
3031
},
3132
{
32-
"docset_name": "AzureLocal",
33-
"build_source_folder": "azure-local",
34-
"build_output_subfolder": "AzureLocal",
33+
"docset_name": "azure-managed-lustre",
34+
"build_source_folder": "azure-managed-lustre",
35+
"build_output_subfolder": "azure-managed-lustre",
3536
"locale": "en-us",
3637
"monikers": [],
37-
"moniker_ranges": [
38-
">=azloc-2408"
39-
],
38+
"moniker_ranges": [],
4039
"open_to_public_contributors": true,
4140
"type_mapping": {
4241
"Conceptual": "Content"
@@ -45,12 +44,14 @@
4544
"template_folder": "_themes"
4645
},
4746
{
48-
"docset_name": "azure-managed-lustre",
49-
"build_source_folder": "azure-managed-lustre",
50-
"build_output_subfolder": "azure-managed-lustre",
47+
"docset_name": "AzureLocal",
48+
"build_source_folder": "azure-local",
49+
"build_output_subfolder": "AzureLocal",
5150
"locale": "en-us",
5251
"monikers": [],
53-
"moniker_ranges": [],
52+
"moniker_ranges": [
53+
">=azloc-2408"
54+
],
5455
"open_to_public_contributors": true,
5556
"type_mapping": {
5657
"Conceptual": "Content"
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path": "adaptive-cloud/app-solutions/index.yml",
5+
"redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "adaptive-cloud/app-solutions/overview-app-design-considerations.md",
10+
"redirect_url": "/azure/architecture/guide",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "adaptive-cloud/app-solutions/overview-patterns-solution-examples.md",
15+
"redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "adaptive-cloud/app-solutions/pattern-cicd-pipeline.md",
20+
"redirect_url": "/azure-stack/user/pattern-cicd-pipeline",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale-onprem-data.md",
25+
"redirect_url": "/azure-stack/user/pattern-cross-cloud-scale-on-premises-data",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale.md",
30+
"redirect_url": "/azure-stack/user/pattern-cross-cloud-scale",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "adaptive-cloud/app-solutions/pattern-geo-distributed.md",
35+
"redirect_url": "/azure-stack/user/pattern-geo-distributed",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "adaptive-cloud/app-solutions/pattern-highly-available-kubernetes.md",
40+
"redirect_url": "/azure-stack/user/pattern-highly-available-kubernetes",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "adaptive-cloud/app-solutions/pattern-hybrid-relay.md",
45+
"redirect_url": "/azure-stack/user/pattern-hybrid-relay",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "adaptive-cloud/app-solutions/pattern-out-of-stock-at-edge.md",
50+
"redirect_url": "/azure-stack/user/pattern-out-of-stock-at-edge",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "adaptive-cloud/app-solutions/pattern-retail-footfall-detection.md",
55+
"redirect_url": "/azure-stack/user/pattern-retail-footfall-detection",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "adaptive-cloud/app-solutions/pattern-tiered-data-analytics.md",
60+
"redirect_url": "/azure-stack/user/pattern-tiered-data-analytics",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "adaptive-cloud/app-solutions/pattern-train-ml-model-at-edge.md",
65+
"redirect_url": "/azure-stack/user/pattern-train-machine-learning-model-at-edge",
66+
"redirect_document_id": false
67+
}
68+
]
69+
}

.openpublishing.redirection.azure-local.json

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,6 +1734,181 @@
17341734
"source_path": "azure-local/manage/storage-repair-speed.md",
17351735
"redirect_url": "/windows-server/storage/storage-spaces/storage-repair-speed",
17361736
"redirect_document_id": false
1737+
},
1738+
{
1739+
"source_path": "azure-local/known-issues-2311.md",
1740+
"redirect_url": "/azure/azure-local/known-issues",
1741+
"redirect_document_id": false
1742+
},
1743+
{
1744+
"source_path": "azure-local/known-issues-2311-2.md",
1745+
"redirect_url": "/azure/azure-local/known-issues",
1746+
"redirect_document_id": false
1747+
},
1748+
{
1749+
"source_path": "azure-local/known-issues-2311-3.md",
1750+
"redirect_url": "/azure/azure-local/known-issues",
1751+
"redirect_document_id": false
1752+
},
1753+
{
1754+
"source_path": "azure-local/known-issues-2311-4.md",
1755+
"redirect_url": "/azure/azure-local/known-issues",
1756+
"redirect_document_id": false
1757+
},
1758+
{
1759+
"source_path": "azure-local/known-issues-2311-5.md",
1760+
"redirect_url": "/azure/azure-local/known-issues",
1761+
"redirect_document_id": false
1762+
},
1763+
{
1764+
"source_path": "azure-local/known-issues-2402.md",
1765+
"redirect_url": "/azure/azure-local/known-issues",
1766+
"redirect_document_id": false
1767+
},
1768+
{
1769+
"source_path": "azure-local/known-issues-2402-1.md",
1770+
"redirect_url": "/azure/azure-local/known-issues",
1771+
"redirect_document_id": false
1772+
},
1773+
{
1774+
"source_path": "azure-local/known-issues-2402-2.md",
1775+
"redirect_url": "/azure/azure-local/known-issues",
1776+
"redirect_document_id": false
1777+
},
1778+
{
1779+
"source_path": "azure-local/known-issues-2402-3.md",
1780+
"redirect_url": "/azure/azure-local/known-issues",
1781+
"redirect_document_id": false
1782+
},
1783+
{
1784+
"source_path": "azure-local/known-issues-2402-4.md",
1785+
"redirect_url": "/azure/azure-local/known-issues",
1786+
"redirect_document_id": false
1787+
},
1788+
{
1789+
"source_path": "azure-local/known-issues-2405.md",
1790+
"redirect_url": "/azure/azure-local/known-issues",
1791+
"redirect_document_id": false
1792+
},
1793+
{
1794+
"source_path": "azure-local/known-issues-2405-1.md",
1795+
"redirect_url": "/azure/azure-local/known-issues",
1796+
"redirect_document_id": false
1797+
},
1798+
{
1799+
"source_path": "azure-local/known-issues-2405-2.md",
1800+
"redirect_url": "/azure/azure-local/known-issues",
1801+
"redirect_document_id": false
1802+
},
1803+
{
1804+
"source_path": "azure-local/known-issues-2405-3.md",
1805+
"redirect_url": "/azure/azure-local/known-issues",
1806+
"redirect_document_id": false
1807+
},
1808+
{
1809+
"source_path": "azure-local/known-issues-2408.md",
1810+
"redirect_url": "/azure/azure-local/known-issues",
1811+
"redirect_document_id": false
1812+
},
1813+
{
1814+
"source_path": "azure-local/known-issues-2408-1.md",
1815+
"redirect_url": "/azure/azure-local/known-issues",
1816+
"redirect_document_id": false
1817+
},
1818+
{
1819+
"source_path": "azure-local/known-issues-2408-2.md",
1820+
"redirect_url": "/azure/azure-local/known-issues",
1821+
"redirect_document_id": false
1822+
},
1823+
{
1824+
"source_path": "azure-local/known-issues-2411.md",
1825+
"redirect_url": "/azure/azure-local/known-issues",
1826+
"redirect_document_id": false
1827+
},
1828+
{
1829+
"source_path": "azure-local/known-issues-2411-1.md",
1830+
"redirect_url": "/azure/azure-local/known-issues",
1831+
"redirect_document_id": false
1832+
},
1833+
{
1834+
"source_path": "azure-local/known-issues-2411-2.md",
1835+
"redirect_url": "/azure/azure-local/known-issues",
1836+
"redirect_document_id": false
1837+
},
1838+
{
1839+
"source_path": "azure-local/security-update/security-update-nov-2023.md",
1840+
"redirect_url": "/azure/azure-local/security-update/security-update",
1841+
"redirect_document_id": false
1842+
},
1843+
{
1844+
"source_path": "azure-local/security-update/security-update-dec-2023.md",
1845+
"redirect_url": "/azure/azure-local/security-update/security-update",
1846+
"redirect_document_id": false
1847+
},
1848+
{
1849+
"source_path": "azure-local/security-update/security-update-jan-2024.md",
1850+
"redirect_url": "/azure/azure-local/security-update/security-update",
1851+
"redirect_document_id": false
1852+
},
1853+
{
1854+
"source_path": "azure-local/security-update/security-update-feb-2024.md",
1855+
"redirect_url": "/azure/azure-local/security-update/security-update",
1856+
"redirect_document_id": false
1857+
},
1858+
{
1859+
"source_path": "azure-local/security-update/security-update-mar-2024.md",
1860+
"redirect_url": "/azure/azure-local/security-update/security-update",
1861+
"redirect_document_id": false
1862+
},
1863+
{
1864+
"source_path": "azure-local/security-update/security-update-apr-2024.md",
1865+
"redirect_url": "/azure/azure-local/security-update/security-update",
1866+
"redirect_document_id": false
1867+
},
1868+
{
1869+
"source_path": "azure-local/security-update/security-update-may-2024.md",
1870+
"redirect_url": "/azure/azure-local/security-update/security-update",
1871+
"redirect_document_id": false
1872+
},
1873+
{
1874+
"source_path": "azure-local/security-update/security-update-jun-2024.md",
1875+
"redirect_url": "/azure/azure-local/security-update/security-update",
1876+
"redirect_document_id": false
1877+
},
1878+
{
1879+
"source_path": "azure-local/security-update/security-update-jul-2024.md",
1880+
"redirect_url": "/azure/azure-local/security-update/security-update",
1881+
"redirect_document_id": false
1882+
},
1883+
{
1884+
"source_path": "azure-local/security-update/security-update-aug-2024.md",
1885+
"redirect_url": "/azure/azure-local/security-update/security-update",
1886+
"redirect_document_id": false
1887+
},
1888+
{
1889+
"source_path": "azure-local/security-update/security-update-sep-2024.md",
1890+
"redirect_url": "/azure/azure-local/security-update/security-update",
1891+
"redirect_document_id": false
1892+
},
1893+
{
1894+
"source_path": "azure-local/security-update/security-update-oct-2024.md",
1895+
"redirect_url": "/azure/azure-local/security-update/security-update",
1896+
"redirect_document_id": false
1897+
},
1898+
{
1899+
"source_path": "azure-local/security-update/security-update-nov-2024.md",
1900+
"redirect_url": "/azure/azure-local/security-update/security-update",
1901+
"redirect_document_id": false
1902+
},
1903+
{
1904+
"source_path": "azure-local/security-update/security-update-dec-2024.md",
1905+
"redirect_url": "/azure/azure-local/security-update/security-update",
1906+
"redirect_document_id": false
1907+
},
1908+
{
1909+
"source_path": "azure-local/security-update/security-update-jan-2025.md",
1910+
"redirect_url": "/azure/azure-local/security-update/security-update",
1911+
"redirect_document_id": false
17371912
}
17381913
]
17391914
}

AKS-Arc/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
items:
169169
- name: Azure Local
170170
href: /azure/azure-local
171-
- name: Azure Adaptive Cloud
171+
- name: Azure adaptive cloud
172172
href: /azure/adaptive-cloud
173173
- name: Azure Arc Jumpstart
174174
href: https://azurearcjumpstart.com/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/

AKS-Arc/aks-create-clusters-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Create Kubernetes clusters using the Azure portal.
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
7-
ms.date: 01/30/2024
7+
ms.date: 02/20/2025
88
ms.reviewer: guanghu
99
ms.lastreviewed: 01/30/2024
1010
---
@@ -29,7 +29,7 @@ This article describes how to create Kubernetes clusters in Azure Local using th
2929
## Create a Kubernetes cluster
3030

3131
1. Sign in to the [Azure portal](https://portal.azure.com/).
32-
1. On the Azure portal search bar, type Kubernetes Azure Arc.
32+
1. On the Azure portal search bar, type **Kubernetes Azure Arc**.
3333
1. Select **Add > Create a Kubernetes cluster with Azure Arc**:
3434

3535
:::image type="content" source="media/aks-create-clusters-portal/cluster-portal.png" alt-text="Screenshot showing cluster creation page on the portal." lightbox="media/aks-create-clusters-portal/cluster-portal.png":::

AKS-Arc/aks-edge-howto-multi-nic.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to attach multiple network interfaces to an AKS Edge Esse
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
7-
ms.date: 07/12/2024
7+
ms.date: 02/25/2025
88
ms.custom: template-how-to, linux-related-content
99
---
1010

@@ -61,19 +61,11 @@ To deploy a Linux node with multiple NICs, you must add your secondary interface
6161

6262
## Verify multiple NIC network configuration settings
6363

64-
After you successfully install and deploy the AKS Edge Essentials node, follow these steps to make sure both primary, and secondary interfaces were created and added to the Linux node:
64+
After you successfully install and deploy the AKS Edge Essentials node, follow these steps to make sure both the primary and secondary interfaces were created and added to the Linux node. To check the interfaces, run the following command:
6565

66-
1. Check the primary interface:
67-
68-
```powershell
69-
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "sudo ip addr eth0"
70-
```
71-
72-
1. Check the secondary network interface. If you added more than one extra interface, it appears as **ethX** with **X** being the number of extra network interfaces:
73-
74-
```powershell
75-
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "sudo ip addr eth1"
76-
```
66+
```powershell
67+
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "sudo ip addr"
68+
```
7769

7870
## Configure Multus CNI plugin
7971

AKS-Arc/azure-rbac-23h2.md

Lines changed: 11 additions & 5 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: 07/26/2024
10-
ms.lastreviewed: 07/26/2024
9+
ms.date: 02/21/2025
10+
ms.lastreviewed: 02/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
@@ -46,9 +46,15 @@ Before you begin, make sure you have the following prerequisites:
4646
```
4747

4848
- To interact with Kubernetes clusters, you must install [**kubectl**](https://kubernetes.io/docs/tasks/tools/) and [**kubelogin**](https://azure.github.io/kubelogin/install.html).
49-
- You need the following permissions to enable Azure RBAC while creating a Kubernetes cluster:
50-
- To create a Kubernetes cluster, you need the **Azure Kubernetes Service Arc Contributor** role.
51-
- To use the `--enable-azure-rbac` parameter, you need the **Role Based Access Control Administrator** role for access to the **Microsoft.Authorization/roleAssignments/write** permission. For more information, see [Azure built-in roles](/azure/role-based-access-control/built-in-roles/general).
49+
- The following permissions are required to enable Azure RBAC when creating a Kubernetes cluster:
50+
- To create a Kubernetes cluster, the [**Azure Kubernetes Service Arc Contributor**](/azure/role-based-access-control/built-in-roles/containers#azure-kubernetes-service-arc-contributor-role) role is required.
51+
- To use the `--enable-azure-rbac` parameter, the [**Role Based Access Control Administrator**](/azure/role-based-access-control/built-in-roles/privileged#role-based-access-control-administrator) role is required for access to the **Microsoft.Authorization/roleAssignments/write** permission.
52+
- To assign these roles, use the [az role assignment create](/cli/azure/role/assignment#az-role-assignment-create) CLI command, or follow [Assign Azure roles using Azure CLI](/azure/role-based-access-control/role-assignments-cli):
53+
54+
```azurecli
55+
az role assignment create --assignee <assignee-object-id> --role <role-name-or-id> --scope $ARM_ID
56+
```
57+
5258
- New role assignments can take up to five minutes to propagate and be updated by the authorization server.
5359
- Once Azure RBAC is enabled, you can access your Kubernetes cluster with the given permissions using either direct mode or proxy mode.
5460
- To access the Kubernetes cluster directly using the `az aksarc get-credentials` command, you need the **Microsoft.HybridContainerService/provisionedClusterInstances/listUserKubeconfig/action**, which is included in the **Azure Kubernetes Service Arc Cluster User** role permission.

0 commit comments

Comments
 (0)