Merge branch 'main' into patch-37

Author: sethmanheim

.openpublishing.publish.config.json

@@ -6,6 +6,7 @@
       "build_output_subfolder": "adaptive-cloud",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": false,
       "type_mapping": {
         "Conceptual": "Content"
@@ -29,14 +30,12 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "AzureLocal",
-      "build_source_folder": "azure-local",
-      "build_output_subfolder": "AzureLocal",
+      "docset_name": "azure-managed-lustre",
+      "build_source_folder": "azure-managed-lustre",
+      "build_output_subfolder": "azure-managed-lustre",
       "locale": "en-us",
       "monikers": [],
-      "moniker_ranges": [
-        ">=azloc-2408"
-      ],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content"
@@ -45,12 +44,14 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "azure-managed-lustre",
-      "build_source_folder": "azure-managed-lustre",
-      "build_output_subfolder": "azure-managed-lustre",
+      "docset_name": "AzureLocal",
+      "build_source_folder": "azure-local",
+      "build_output_subfolder": "AzureLocal",
       "locale": "en-us",
       "monikers": [],
-      "moniker_ranges": [],
+      "moniker_ranges": [
+        ">=azloc-2408"
+      ],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content"

.openpublishing.redirection.adaptive-cloud.json

@@ -0,0 +1,69 @@
+{
+  "redirections": [
+    {
+      "source_path": "adaptive-cloud/app-solutions/index.yml",
+      "redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/overview-app-design-considerations.md",
+      "redirect_url": "/azure/architecture/guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/overview-patterns-solution-examples.md",
+      "redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-cicd-pipeline.md",
+      "redirect_url": "/azure-stack/user/pattern-cicd-pipeline",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale-onprem-data.md",
+      "redirect_url": "/azure-stack/user/pattern-cross-cloud-scale-on-premises-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale.md",
+      "redirect_url": "/azure-stack/user/pattern-cross-cloud-scale",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-geo-distributed.md",
+      "redirect_url": "/azure-stack/user/pattern-geo-distributed",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-highly-available-kubernetes.md",
+      "redirect_url": "/azure-stack/user/pattern-highly-available-kubernetes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-hybrid-relay.md",
+      "redirect_url": "/azure-stack/user/pattern-hybrid-relay",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-out-of-stock-at-edge.md",
+      "redirect_url": "/azure-stack/user/pattern-out-of-stock-at-edge",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-retail-footfall-detection.md",
+      "redirect_url": "/azure-stack/user/pattern-retail-footfall-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-tiered-data-analytics.md",
+      "redirect_url": "/azure-stack/user/pattern-tiered-data-analytics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-train-ml-model-at-edge.md",
+      "redirect_url": "/azure-stack/user/pattern-train-machine-learning-model-at-edge",
+      "redirect_document_id": false
+    }
+  ]
+}

AKS-Arc/TOC.yml

@@ -168,7 +168,7 @@
     items:
     - name: Azure Local
       href: /azure/azure-local
-    - name: Azure Adaptive Cloud
+    - name: Azure adaptive cloud
       href: /azure/adaptive-cloud
     - name: Azure Arc Jumpstart
       href: https://azurearcjumpstart.com/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/

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

@@ -29,7 +29,7 @@ This article describes how to create Kubernetes clusters in Azure Local using th
 ## Create a Kubernetes cluster
 
 1. Sign in to the [Azure portal](https://portal.azure.com/).
-1. On the Azure portal search bar, type Kubernetes Azure Arc.
+1. On the Azure portal search bar, type **Kubernetes Azure Arc**.
 1. Select **Add > Create a Kubernetes cluster with Azure Arc**:
 
    :::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

@@ -4,7 +4,7 @@ description: Learn how to attach multiple network interfaces to an AKS Edge Esse
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 07/12/2024
+ms.date: 02/25/2025
 ms.custom: template-how-to, linux-related-content
 ---
 
@@ -61,19 +61,11 @@ To deploy a Linux node with multiple NICs, you must add your secondary interface
 
 ## Verify multiple NIC network configuration settings
 
-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:
+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:
 
-1. Check the primary interface:
-
-   ```powershell
-   Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "sudo ip addr eth0"
-   ```
-
-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:
-
-   ```powershell
-   Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "sudo ip addr eth1"
-   ```
+```powershell
+Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "sudo ip addr"
+```
 
 ## Configure Multus CNI plugin
 

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

@@ -6,8 +6,8 @@ ms.custom: devx-track-azurecli
 author: sethmanheim
 ms.author: sethm
 ms.reviewer: leslielin
-ms.date: 07/26/2024
-ms.lastreviewed: 07/26/2024
+ms.date: 02/21/2025
+ms.lastreviewed: 02/21/2025
 
 # 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.
 # Keyword: Kubernetes role-based access control AKS Azure RBAC AD
@@ -46,9 +46,15 @@ Before you begin, make sure you have the following prerequisites:
   ```
 
 - To interact with Kubernetes clusters, you must install [**kubectl**](https://kubernetes.io/docs/tasks/tools/) and [**kubelogin**](https://azure.github.io/kubelogin/install.html).
-- You need the following permissions to enable Azure RBAC while creating a Kubernetes cluster:
-  - To create a Kubernetes cluster, you need the **Azure Kubernetes Service Arc Contributor** role.
-  - 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).
+- The following permissions are required to enable Azure RBAC when creating a Kubernetes cluster:
+  - 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.
+  - 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.
+  - 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):
+
+    ```azurecli
+    az role assignment create --assignee <assignee-object-id> --role <role-name-or-id> --scope $ARM_ID
+    ```
+    
   - New role assignments can take up to five minutes to propagate and be updated by the authorization server.
 - Once Azure RBAC is enabled, you can access your Kubernetes cluster with the given permissions using either direct mode or proxy mode.
   - 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.

AKS-Arc/breadcrumb/toc.yml

@@ -1,12 +1,12 @@
-- name: Adaptive Cloud documentation
-  tocHref: /azure/adaptive-cloud/
-  topicHref: /azure/adaptive-cloud/index
-  items:
+- name: Azure
+  tocHref: /azure
+  topicHref: /azure/index
+  items: 
   - name: AKS enabled by Azure Arc
     tocHref: /azure/aks/aksarc/
     topicHref: /azure/aks/aksarc/index
-###    items:
-### For contextual TOC
+  ###    items:
+  ### For contextual TOC
   - name: AKS enabled by Azure Arc
     tocHref: /azure/azure-arc/kubernetes/
     topicHref: /azure/aks/aksarc/index

AKS-Arc/concepts-support.md

@@ -3,7 +3,7 @@ title: Tested resource limits, VM sizes, and regions for AKS enabled by Azure Ar
 description: Resource limits, VM sizes, regions for Azure Kubernetes Service (AKS) enabled by Azure Arc.
 author: sethmanheim
 ms.topic: conceptual
-ms.date: 12/21/2023
+ms.date: 02/20/2025
 ms.author: sethm 
 ms.lastreviewed: 02/03/2022
 ms.reviewer: mamezgeb

AKS-Arc/create-clusters-bicep.md

@@ -3,7 +3,7 @@ title: Create Kubernetes clusters using Bicep
 description: Learn how to create Kubernetes clusters in Azure Local using Bicep.
 ms.topic: how-to
 ms.custom: devx-track-azurecli
-ms.date: 07/26/2024
+ms.date: 02/26/2025
 author: sethmanheim
 ms.author: sethm 
 ms.reviewer: haojiehang
@@ -34,22 +34,25 @@ Before you begin, make sure you have the following prerequisites:
 
 ## Create an SSH key pair
 
-To create an SSH key pair (same as Azure AKS), use the following procedure:
+Create an SSH key pair in Azure and store the private key file for troubleshooting and log collection purposes. For detailed instructions, see [Create and store SSH keys with the Azure CLI](/azure/virtual-machines/ssh-keys-azure-cli) or in the [Azure portal](/azure/virtual-machines/ssh-keys-portal).
 
-1. [Open a Cloud Shell session](https://shell.azure.com) in your browser or open a terminal on your local machine.
-1. Create an SSH key pair using `az sshkey create`:
+1. [Open a Cloud Shell session](https://shell.azure.com/) in your web browser or launch a terminal on your local machine.
+1. Create an SSH key pair using the [az sshkey create](/cli/azure/sshkey#az-sshkey-create) command:  
 
    ```azurecli
-   az sshkey create --name <Public_SSH_Key> --resource-group <Resource_Group_Name>
+   az sshkey create --name "mySSHKey" --resource-group $<resource_group_name>
    ```
 
-   Or, create a local SSH key pair using `ssh-keygen`:
+   or, use the `ssh-keygen` command:
 
-   ```bash  
-   ssh-keygen -t rsa -b 4096
+   ```azurecli
+   ssh-keygen -t rsa -b 4096 
    ```
 
-It's recommended that you create an SSH key pair in Azure, as you can use it later for node access or troubleshooting. For more information about creating SSH keys, see [Create and manage SSH keys for authentication in Azure](/azure/virtual-machines/linux/create-ssh-keys-detailed) and [Restrict SSH Access](restrict-ssh-access.md).
+1. Retrieve the value of your public key from Azure or from your local machine under **/.ssh/id_rsa.pub**.
+
+For more options, you can either follow [Configure SSH keys for an AKS cluster](/azure/aks/aksarc/configure-ssh-keys) to create SSH keys, or use [Restrict SSH access](/azure/aks/aksarc/restrict-ssh-access) during cluster creation. To access nodes afterward, see [Connect to Windows or Linux worker nodes with SSH](/azure/aks/aksarc/ssh-connect-to-windows-and-linux-worker-nodes).
+
 
 ## Download and update the Bicep scripts
 

AKS-Arc/create-clusters-terraform.md

@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters using Terraform.
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 02/10/2025
+ms.date: 02/26/2025
 
 ---
 
@@ -32,23 +32,25 @@ Before you begin, make sure you have the following prerequisites:
 
 ## Create an SSH key pair
 
-To create an SSH key pair (same as Azure AKS), use the following procedure:
+Create an SSH key pair in Azure and store the private key file for troubleshooting and log collection purposes. For detailed instructions, see [Create and store SSH keys with the Azure CLI](/azure/virtual-machines/ssh-keys-azure-cli) or in the [Azure portal](/azure/virtual-machines/ssh-keys-portal).
 
-1. [Open a Cloud Shell session](https://shell.azure.com/) in your browser.
-1. Create an SSH key pair using the [az sshkey create](/cli/azure/sshkey#az-sshkey-create) command, [from the portal](/azure/virtual-machines/ssh-keys-portal), or the `ssh-keygen` command:  
+1. [Open a Cloud Shell session](https://shell.azure.com/) in your web browser or launch a terminal on your local machine.
+1. Create an SSH key pair using the [az sshkey create](/cli/azure/sshkey#az-sshkey-create) command:  
 
    ```azurecli
-   az sshkey create --name "mySSHKey" --resource-group "myResourceGroup"
+   az sshkey create --name "mySSHKey" --resource-group $<resource_group_name>
    ```
 
-   or
+   or, use the `ssh-keygen` command:
 
    ```azurecli
    ssh-keygen -t rsa -b 4096 
    ```
 
 1. Retrieve the value of your public key from Azure or from your local machine under **/.ssh/id_rsa.pub**.
 
+For more options, you can either follow [Configure SSH keys for an AKS cluster](/azure/aks/aksarc/configure-ssh-keys) to create SSH keys, or use [Restrict SSH access](/azure/aks/aksarc/restrict-ssh-access) during cluster creation. To access nodes afterward, see [Connect to Windows or Linux worker nodes with SSH](/azure/aks/aksarc/ssh-connect-to-windows-and-linux-worker-nodes).
+
 ## Sign in to Azure
 
 Terraform only supports authenticating to Azure with the Azure CLI using [`az login`](/cli/azure/reference-index#az-login). Authenticating using Azure PowerShell isn't supported. Therefore, while you can use the Azure PowerShell module when doing your Terraform work, you must first [authenticate to Azure](/azure/developer/terraform/authenticate-to-azure):