Merge branch 'main' of https://github.com/MicrosoftDocs/azure-stack-docs-pr into mefresh

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/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

adaptive-cloud/TOC.yml

@@ -0,0 +1,3 @@
+items:
+  - name: Azure adaptive cloud documentation
+    href: index.yml