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

Author: alkohli

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
-:allowed-filename-matches ["azure-stack" "AKS-Hybrid" "azure-managed-lustre"]}
+:allowed-filename-matches ["azure-stack" "AKS-Hybrid" "azure-managed-lustre" "azure-local"]}

AKS-Hybrid/TOC.yml

@@ -3,14 +3,14 @@
 - name: Overview
   expanded: true
   items:
-  - name: What is AKS enabled by Arc?
+  - name: What is AKS enabled by Azure Arc?
     href: aks-overview.md
-  - name: Compare AKS enabled by Arc deployment options
-    href: https://techcommunity.microsoft.com/t5/azure-arc-blog/comparing-feature-sets-for-aks-enabled-by-azure-arc-deployment/ba-p/4188163
   - name: Supported Kubernetes versions
     href: supported-kubernetes-versions.md  
   - name: Data collection
     href: data-collection.md
+  - name: Blogs and announcements
+    href: blogs-announcements.md
 - name: AKS on Azure Local, version 23H2
   expanded: true
   items:
@@ -60,8 +60,6 @@
         href: create-clusters-bicep.md
       - name: Terraform
         href: create-clusters-terraform.md
-      - name: Quickstart template
-        href: /samples/azure/azure-quickstart-templates/aks-on-ashci
       - name: Azure Resource Manager template
         href: resource-manager-quickstart.md
     - name: Networking
@@ -169,13 +167,13 @@
   - name: Resources
     items:
     - name: Azure Local
-      href: /azure-stack/hci/index
-    - name: Azure hybrid cloud
-      href: /hybrid
+      href: /azure-local/index
+    - 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/
-    - name: Azure roadmap
-      href: https://azure.microsoft.com/roadmap/
+    - name: AKS enabled by Arc roadmap
+      href: https://github.com/Azure/aksArc/projects
 - name: AKS Edge Essentials
   items:
   - name: Overview
@@ -425,124 +423,124 @@
           href: update-akshci-host-powershell.md
         - name: Use Windows Admin Center
           href: update-akshci-host-windows-admin-center.md
-        - name: Upgrade Kubernetes version
-          items:
-          - name: Use PowerShell
-            href: upgrade.md
-          - name: Use Windows Admin Center
-            href: upgrade-kubernetes.md
-      - name: Develop applications
+      - name: Upgrade Kubernetes version
         items:
-          - name: Deploy applications with Helm
-            href: helm-deploy.md
-          - name: Deploy Azure Arc-enabled data services
-            href: deploy-arc-data-services.md
-          - name: Deploy configurations using GitOps
-            href: /azure/azure-arc/kubernetes/tutorial-use-gitops-flux2?toc=/azure/aks/hybrid/toc.json&bc=/azure/aks/hybrid/breadcrumb/toc.json
-          - name: Implement CI/CD using GitOps
-            href: /azure/azure-arc/kubernetes/tutorial-gitops-flux2-ci-cd?toc=/azure/aks/hybrid/toc.json&bc=/azure/aks/hybrid/breadcrumb/toc.json
-      - name: Scale
-        items:    
-            - name: Scale an AKS cluster
-              href: scale-cluster.md
-            - name: Use autoscaler
-              items:
-              - name: Use PowerShell
-                href: work-with-horizontal-autoscaler.md
-              - name: Use autoscaler profiles
-                href: work-with-autoscaler-profiles.md
-      - name: Restart, stop, restore
-        items:    
-        - name: Restart, remove, or reinstall AKS
-          href: restart-cluster.md
-        - name: Stop and start an AKS cluster
-          href: stop-start-cluster.md
-        - name: Restore AKS cluster from disaster
-          href: restore-aks-cluster.md
-        - name: Back up or restore workload clusters using Velero
-          href: backup-workload-cluster.md
-      - name: Use Azure Arc Kubernetes
-        items:
-        - name: Connect to Azure Arc for Kubernetes
-          href: connect-to-arc.md
-        - name: Az module CLI commands
-          href: /cli/azure/connectedk8s
-      - name: Networking
-        items:
-        - name: Use proxy settings
-          href: set-proxy-settings.md
-        - name: Update proxy settings and certificates
-          href: proxy-change.md
-        - name: Configure load balancer
-          href: configure-load-balancer.md
-        - name: Use multiple load balancers
-          href: multiple-load-balancers.md
-        - name: Configure a custom load balancer
-          href: configure-custom-load-balancer.md
-        - name: Use an ingress controller
-          href: create-ingress-controller.md
-        - name: Use Microsoft Software Defined Networking (SDN)
-          items:
-          - name: Deploy SDN
-            href: software-defined-networking.md
-          - name: Deploy application clusters on different SDN virtual networks
-            href: deploy-target-clusters-virtual-networks.md
-      - name: Storage
-        items:
-        - name: Use persistent volumes
-          href: persistent-volume.md
-      - name: Security and authentication
-        items:
-        - name: Restrict SSH access
-          href: restrict-ssh-access-22h2.md
-        - name: Use Active Directory single sign-on
-          href: ad-sso.md
-        - name: Use Kubernetes RBAC with Microsoft Entra ID
-          href: kubernetes-rbac-entra-id.md
-        - name: Use Azure RBAC with AKS clusters
-          href: azure-rbac-aks-hybrid.md
-        - name: Update certificate bundle on container hosts
-          href: update-certificate-bundle.md
-        - name: Update certificates
-          href: update-certificates.md
-        - name: Secrets Store CSI Driver configuration
-          href: secrets-store-csi-driver.md
-        - name: Encrypt etcd secrets
-          href: encrypt-secrets.md
-        - name: Configure Defender for Azure Arc-enabled Kubernetes clusters
-          href: /azure/security-center/defender-for-kubernetes-azure-arc?tabs=k8s-deploy-asc%2ck8s-verify-asc%2ck8s-remove-arc
-      - name: Monitoring and logging
-        items:    
-        - name: Use on-premises monitoring
-          href: monitor-logging.md
-      - name: Use Windows Server containers
-        items:
-        - name: Deploy .NET applications
-          href: deploy-windows-application.md
-        - name: Configure group Managed Service Account support
-          href: prepare-windows-nodes-gmsa.md
-        - name: Adapt apps for mixed-OS Kubernetes clusters
-          href: adapt-apps-mixed-os-clusters.md
-      - name: Develop and run applications
+        - name: Use PowerShell
+          href: upgrade.md
+        - name: Use Windows Admin Center
+          href: upgrade-kubernetes.md
+    - name: Develop applications
+      items:
+        - name: Deploy applications with Helm
+          href: helm-deploy.md
+        - name: Deploy Azure Arc-enabled data services
+          href: deploy-arc-data-services.md
+        - name: Deploy configurations using GitOps
+          href: /azure/azure-arc/kubernetes/tutorial-use-gitops-flux2?toc=/azure/aks/hybrid/toc.json&bc=/azure/aks/hybrid/breadcrumb/toc.json
+        - name: Implement CI/CD using GitOps
+          href: /azure/azure-arc/kubernetes/tutorial-gitops-flux2-ci-cd?toc=/azure/aks/hybrid/toc.json&bc=/azure/aks/hybrid/breadcrumb/toc.json
+    - name: Scale
+      items:    
+          - name: Scale an AKS cluster
+            href: scale-cluster.md
+          - name: Use autoscaler
+            items:
+            - name: Use PowerShell
+              href: work-with-horizontal-autoscaler.md
+            - name: Use autoscaler profiles
+              href: work-with-autoscaler-profiles.md
+    - name: Restart, stop, restore
+      items:    
+      - name: Restart, remove, or reinstall AKS
+        href: restart-cluster.md
+      - name: Stop and start an AKS cluster
+        href: stop-start-cluster.md
+      - name: Restore AKS cluster from disaster
+        href: restore-aks-cluster.md
+      - name: Back up or restore workload clusters using Velero
+        href: backup-workload-cluster.md
+    - name: Use Azure Arc Kubernetes
+      items:
+      - name: Connect to Azure Arc for Kubernetes
+        href: connect-to-arc.md
+      - name: Az module CLI commands
+        href: /cli/azure/connectedk8s
+    - name: Networking
+      items:
+      - name: Use proxy settings
+        href: set-proxy-settings.md
+      - name: Update proxy settings and certificates
+        href: proxy-change.md
+      - name: Configure load balancer
+        href: configure-load-balancer.md
+      - name: Use multiple load balancers
+        href: multiple-load-balancers.md
+      - name: Configure a custom load balancer
+        href: configure-custom-load-balancer.md
+      - name: Use an ingress controller
+        href: create-ingress-controller.md
+      - name: Use Microsoft Software Defined Networking (SDN)
         items:
-        - name: Install existing applications with Helm
-          href: kubernetes-helm.md
-        - name: Use OpenFaaS
-          href: openfaas.md
-        - name: Use Bridge to Kubernetes with Visual Studio Code
-          href: https://code.visualstudio.com/docs/containers/bridge-to-kubernetes
-        - name: Use Bridge to Kubernetes with Visual Studio
-          href: /visualstudio/containers/bridge-to-kubernetes
-        - name: Deploy a Java application with Open Liberty or WebSphere Liberty
-          href: deploy-java-liberty-app.md
-        - name: Deploy Linux applications
-          href: deploy-linux-application.md
-      - name: Helper scripts
-        items: 
-        - name: Set up multiple administrators
-          href: set-multiple-administrators.md
-        - name: Remove old PowerShell modules
-          href: https://github.com/Azure/aks-hci/issues/130
+        - name: Deploy SDN
+          href: software-defined-networking.md
+        - name: Deploy application clusters on different SDN virtual networks
+          href: deploy-target-clusters-virtual-networks.md
+    - name: Storage
+      items:
+      - name: Use persistent volumes
+        href: persistent-volume.md
+    - name: Security and authentication
+      items:
+      - name: Restrict SSH access
+        href: restrict-ssh-access-22h2.md
+      - name: Use Active Directory single sign-on
+        href: ad-sso.md
+      - name: Use Kubernetes RBAC with Microsoft Entra ID
+        href: kubernetes-rbac-entra-id.md
+      - name: Use Azure RBAC with AKS clusters
+        href: azure-rbac-aks-hybrid.md
+      - name: Update certificate bundle on container hosts
+        href: update-certificate-bundle.md
+      - name: Update certificates
+        href: update-certificates.md
+      - name: Secrets Store CSI Driver configuration
+        href: secrets-store-csi-driver.md
+      - name: Encrypt etcd secrets
+        href: encrypt-secrets.md
+      - name: Configure Defender for Azure Arc-enabled Kubernetes clusters
+        href: /azure/security-center/defender-for-kubernetes-azure-arc?tabs=k8s-deploy-asc%2ck8s-verify-asc%2ck8s-remove-arc
+    - name: Monitoring and logging
+      items:    
+      - name: Use on-premises monitoring
+        href: monitor-logging.md
+    - name: Use Windows Server containers
+      items:
+      - name: Deploy .NET applications
+        href: deploy-windows-application.md
+      - name: Configure group Managed Service Account support
+        href: prepare-windows-nodes-gmsa.md
+      - name: Adapt apps for mixed-OS Kubernetes clusters
+        href: adapt-apps-mixed-os-clusters.md
+    - name: Develop and run applications
+      items:
+      - name: Install existing applications with Helm
+        href: kubernetes-helm.md
+      - name: Use OpenFaaS
+        href: openfaas.md
+      - name: Use Bridge to Kubernetes with Visual Studio Code
+        href: https://code.visualstudio.com/docs/containers/bridge-to-kubernetes
+      - name: Use Bridge to Kubernetes with Visual Studio
+        href: /visualstudio/containers/bridge-to-kubernetes
+      - name: Deploy a Java application with Open Liberty or WebSphere Liberty
+        href: deploy-java-liberty-app.md
+      - name: Deploy Linux applications
+        href: deploy-linux-application.md
+    - name: Helper scripts
+      items: 
+      - name: Set up multiple administrators
+        href: set-multiple-administrators.md
+      - name: Remove old PowerShell modules
+        href: https://github.com/Azure/aks-hci/issues/130
   - name: Troubleshooting
     items:
     - name: Uninstall AKS cluster provisioning from Azure preview

AKS-Hybrid/blogs-announcements.md

@@ -0,0 +1,42 @@
+---
+title: AKS enabled by Azure Arc blogs and announcements
+description: Learn about the latest blogs and announcements for Azure Kubernetes Service (AKS) enabled by Azure Arc.
+author: sethmanheim
+ms.author: sethm
+ms.date: 12/3/2024
+ms.topic: conceptual
+
+---
+
+# Blogs and announcements
+
+This article provides a list of blogs and announcements for Azure Kubernetes Service (AKS) enabled by Azure Arc.
+
+See the [Microsoft Tech Community - Azure Arc Blogs](https://techcommunity.microsoft.com/tag/azure%20arc?nodeId=board%3AAzureArcBlog) for a complete list of relevant articles.
+
+## 2024
+
+| Month | News |
+|-|-|
+| Nov | *Blog*: [Speed Innovation with Arc-enabled Kubernetes Applications](https://techcommunity.microsoft.com/blog/azurearcblog/speed-innovation-with-arc-enabled-kubernetes-applications/4298658) <br/> *Blog*: [AKS Arc - Optimized for AI Workloads](https://techcommunity.microsoft.com/blog/azurearcblog/aks-arc---optimized-for-ai-workloads/4292435) <br/>*Blog*: [Introducing Azure Local, cloud infrastructure for distributed locations enabled by Azure Arc](https://techcommunity.microsoft.com/blog/azurearcblog/introducing-azure-local-cloud-infrastructure-for-distributed-locations-enabled-b/4296017) <br/>*(Azure Local pricing includes AKS enabled by Arc)*<br/> *Video*: [Azure Local with lost cost hardware](https://youtu.be/yxlAfS9mh2E) <br/> *Video*: [Disconnected operations for Azure Local](https://www.youtube.com/watch?v=8VwhonI_Jq8)|
+| July | *Blog*: [Compare feature sets for AKS enabled by Azure Arc deployment options](https://techcommunity.microsoft.com/t5/azure-arc-blog/comparing-feature-sets-for-aks-enabled-by-azure-arc-deployment/ba-p/4188163)|
+| April  | *Blog*:  [Sneak peek at new Azure edge infrastructure at Hannover Messe 2024](https://techcommunity.microsoft.com/t5/azure-stack-blog/sneak-peek-at-new-azure-edge-infrastructure-at-hannover-messe/ba-p/4120256)|
+
+## 2023
+
+| Month | News |
+|-|-|
+| May | *Blog*: [Achieve distributed high availability: Stack HCI and AKS Hybrid](https://techcommunity.microsoft.com/t5/azure-architecture-blog/achieving-distributed-high-availability-stack-hci-and-aks-hybrid/ba-p/3820279) |
+| March | **GA**: [Bring all your workloads to the edge with AKS Edge Essentials. Now generally available!](https://techcommunity.microsoft.com/t5/internet-of-things-blog/bring-all-your-workloads-to-the-edge-with-aks-edge-essentials/ba-p/3765162) <br/> *Blog*:  [Announcing the 3-year retirement of Windows Server 2019 on Azure Kubernetes Service and AKS hybrid](https://techcommunity.microsoft.com/t5/containers/announcing-the-3-year-retirement-of-windows-server-2019-on-azure/ba-p/3777341) <br/> *Blog*: [How do AKS and AKS on Azure Stack HCI compare?](https://techcommunity.microsoft.com/t5/azure-arc-blog/how-do-aks-and-aks-on-azure-stack-hci-compare/ba-p/3761670)|
+| Feb | **GA**: [AKS enabled by Azure Arc is now available on Azure Stack HCI 23H2](https://techcommunity.microsoft.com/t5/azure-stack-blog/aks-enabled-by-azure-arc-is-now-available-on-azure-stack-hci/ba-p/4045648) |
+
+## 2021
+
+| Month | News |
+|-|-|
+| June | **GA**: [Announcing the GA of Azure IoT Edge for Linux on Windows](https://techcommunity.microsoft.com/t5/internet-of-things-blog/announcing-the-ga-of-azure-iot-edge-for-linux-on-windows/ba-p/2477508) |
+| May | **GA**: [Azure Kubernetes Service on Azure Stack HCI now Generally Available](https://techcommunity.microsoft.com/t5/azure-stack-blog/azure-kubernetes-service-on-azure-stack-hci-now-generally/ba-p/2382390) |
+
+## Next steps
+
+[AKS enabled by Azure Arc overview](overview.md)

AKS-Hybrid/breadcrumb/toc.yml

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

AKS-Hybrid/create-clusters-terraform.md

@@ -10,7 +10,7 @@ ms.date: 11/15/2024
 
 # Create Kubernetes clusters using Terraform (preview)
 
-This article describes how to create Kubernetes cluster in Azure Local using Terraform and Azure Verified Module. Th workflow is as follows:
+This article describes how to create Kubernetes clusters in Azure Local using Terraform and the Azure Verified Module. The workflow is as follows:
 
 - Create an SSH key pair.
 - Create a Kubernetes cluster in Azure Local 23H2 using Terraform. By default, the cluster is Azure Arc-connected.

AKS-Hybrid/docfx.json

@@ -53,7 +53,7 @@
       "feedback_help_link_url": "https://github.com/Azure/aksArc/issues",
       "feedback_help_link_type": "get-product-support",
       "feedback_product_url": "https://feedback.azure.com/d365community/forum/a2f8da29-b853-ec11-8f8e-0022481f2fe7",
-      "breadcrumb_path": "/azure/aks/hybrid/breadcrumb/toc.json",
+      "breadcrumb_path": "/azure/aks/aksarc/breadcrumb/toc.json",
       "extendBreadcrumb": false,
       "manager":"femila",
       "ms.service": "azure-stack",
@@ -66,8 +66,8 @@
         "./**/*.md": "azure-kubernetes-service-hybrid"
       },
       "titleSuffix": {
-        "**/*.md": "AKS hybrid",
-        "aks-hci/**/*.md": "AKS hybrid"
+        "**/*.md": "AKS enabled by Azure Arc",
+        "azure-local/**/*.md": "AKS enabled by Azure Arc"
       },
       "feedback_product_url": {
         "aks-hci/**/*.md": "https://feedback.azure.com/d365community/forum/a2f8da29-b853-ec11-8f8e-0022481f2fe7"
@@ -76,6 +76,6 @@
       }
     },
     "template": [],
-    "dest": "AKS-Hybrid"
+    "dest": "AKS-Arc"
   }
 }