Fix merge conflict

Author: gitName

.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.aks.json

@@ -1909,6 +1909,11 @@
       "source_path": "azure-local/security-update/security-update-jan-2025.md", 
       "redirect_url": "/azure/azure-local/security-update/security-update", 
       "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-local/manage/trusted-launch-vm-deploy.md", 
+      "redirect_url": "/azure/azure-local/manage/trusted-launch-vm-overview", 
+      "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.azure-local.json

@@ -1620,6 +1620,106 @@
       "redirect_url": "/azure-stack/hci/migrate/migration-azure-migrate-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "azure-stack/asdk/index.yml",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-admin-basics.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-advanced-eval.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-architecture.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-cli.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-connect.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-deploy-considerations.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-deploy-powershell.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-download.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-install.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-post-deploy.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-prepare-host.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-redeploy.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-register.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-release-notes.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-start-stop.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-telemetry.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-troubleshooting.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-validate-backup.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/asdk/asdk-what-is.md",
+      "redirect_url": "/azure-stack/operator/azure-stack-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "azure-stack/hci/manage/monitor-hci-single-23h2.md",
       "redirect_url": "/azure-stack/hci/manage/monitor-single-23h2",

.openpublishing.redirection.json

@@ -99,6 +99,7 @@
       - name: Deploy and configure Workload Identity
         href: workload-identity.md     
     - name: Storage
+      href: concepts-storage.md
       items:
       - name: CSI storage drivers
         items: 
@@ -132,6 +133,8 @@
             href: kubernetes-monitor-object-events.md
           - name: Get kubelet logs
             href: aks-get-kubelet-logs.md
+          - name: Monitor control plane metrics
+            href: control-plane-metrics.md
           - name: Enable Container Insights
             href: /azure/azure-monitor/containers/kubernetes-monitoring-enable
           - name: Monitor Kubernetes audit events
@@ -144,20 +147,28 @@
             href: kubernetes-monitor-metrics.md
   - name: Troubleshooting
     items:
-    - name: Troubleshoot & known issues
+    - name: Troubleshoot and known issues
       href: aks-troubleshoot.md
+    - name: Control plane configuration validation errors
+      href: control-plane-validation-errors.md
+    - name: Connectivity issues with MetalLB
+      href: load-balancer-issues.md 
     - name: K8sVersionValidation error
       href: cluster-k8s-version.md
     - name: Use diagnostic checker
       href: aks-arc-diagnostic-checker.md
     - name: KubeAPIServer unreachable error
       href: kube-api-server-unreachable.md
     - name: Can't see VM SKUs on Azure portal
-      href: tsg-check-vm-sku.md
+      href: check-vm-sku.md
     - name: Deleted AKS Arc cluster still visible on Azure portal
       href: deleted-cluster-visible.md
     - name: Can't fully delete AKS Arc cluster with PodDisruptionBudget (PDB) resources
       href: delete-cluster-pdb.md
+    - name: Azure Advisor upgrade recommendation
+      href: azure-advisor-upgrade.md
+    - name: Issues after deleting storage volumes
+      href: delete-storage-volume.md
   - name: Reference
     items:
     - name: Azure CLI
@@ -180,6 +191,8 @@
     href: aks-edge-overview.md
   - name: System requirements and support matrix
     href: aks-edge-system-requirements.md
+  - name: What's new in AKS Edge Essentials
+    href: aks-edge-whats-new.md
   - name: Quickstart
     href: aks-edge-quickstart.md
   - name: Concepts
@@ -214,14 +227,20 @@
       href: aks-edge-howto-deploy-azure-iot.md
     - name: Offline installation
       href: aks-edge-howto-offline-install.md
-    - name: Access TPM secrets
-      href: aks-edge-howto-access-tpm.md
     - name: Additional configuration
       href: aks-edge-howto-more-configs.md
     - name: Use GPU acceleration
       href: aks-edge-gpu.md
-    - name: Configure Workload Identity
-      href: aks-edge-workload-identity.md
+    - name: Security
+      items:
+      - name: Configure Workload Identity
+        href: aks-edge-workload-identity.md      
+      - name: Access TPM secrets
+        href: aks-edge-howto-access-tpm.md
+      - name: Enable secret encryption with the KMS plugin
+        href: aks-edge-howto-secret-encryption.md
+      - name: Use the Key Manager for Kubernetes extension
+        href: aks-edge-howto-key-manager.md        
     - name: Update AKS Edge Essentials
       items:
       - name: Update online
@@ -256,8 +275,6 @@
       href: aks-edge-troubleshoot-overview.md
     - name: Logs 
       href: aks-edge-resources-logs.md
-    - name: Release notes and known issues
-      href: https://github.com/Azure/AKS-Edge/releases
     - name: File bugs
       href: https://github.com/Azure/AKS-Edge/issues
     - name: AKS Edge Essentials pricing
@@ -316,6 +333,8 @@
         href: vnet.yml
 - name: AKS on Windows Server
   items:
+  - name: AKS on Windows Server retirement
+    href: aks-windows-server-retirement.md
   - name: Overview
     href: overview.md
   - name: System requirements
@@ -389,8 +408,6 @@
           href: concepts-node-networking.md
         - name: Kubernetes container networking
           href: concepts-container-networking.md
-    - name: Storage
-      href: concepts-storage.md
     - name: Application availability
       href: app-availability.md
     - name: Scale

AKS-Arc/TOC.yml

@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters in Azure Local using Azure
 ms.topic: how-to
 ms.custom: devx-track-azurecli
 author: sethmanheim
-ms.date: 12/18/2024
+ms.date: 02/18/2025
 ms.author: sethm 
 ms.lastreviewed: 01/25/2024
 ms.reviewer: guanghu
@@ -52,10 +52,14 @@ az aksarc create -n $aksclustername -g $resource_group --custom-location $custom
 
 After a few minutes, the command completes and returns JSON-formatted information about the cluster.
 
-> [!NOTE]
-> - The SSH key value is the public key for accessing nodes in the provisioned cluster. By default, this key is located at `~/.ssh/id_rsa.pub`. You can specify a different location using the `--ssh-key-value` parameter during cluster creation.
-> - The `--generate-ssh-keys` parameter is required if there's no pre-existing SSH key on your local machine. If you don't include this parameter during cluster creation and no SSH key exists, you receive an error message.
-> - If you already have an SSH key on your local machine, the AKS cluster reuses that key. In this case, specifying `--generate-ssh-keys`, or omitting that parameter, has no effect.
+### Considerations
+
+Note the following considerations when you create a cluster:
+
+- SSH keys are essential for troubleshooting and log collection. Be sure to save your private key file for future use. To access nodes, see [Connect to Windows or Linux worker nodes with SSH](/azure/aks/aksarc/ssh-connect-to-windows-and-linux-worker-nodes).
+- You can use a pre-existing SSH key or [configure SSH keys for an AKS cluster](configure-ssh-keys.md) during cluster creation. If there's no pre-existing SSH key on your local machine, the `--generate-ssh-keys` parameter is required. You can also restrict SSH access by following [the documentation](restrict-ssh-access.md). 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).
+- If you don't include `--generate-ssh-keys` during cluster creation and no SSH key exists, you receive an error message. If you already have an SSH key on your local machine, the AKS cluster reuses it. In this case, it makes no difference whether you specify `--generate-ssh-keys` or not.
+- By default, the SSH key is stored at **~/.ssh/id_rsa.pub**. During cluster creation, you can specify an alternate location using the `--ssh-key-value` parameter.
 
 > [!IMPORTANT]
 > To use Azure RBAC or workload identity for an AKS cluster, you must pass the required parameters during cluster creation using Azure CLI. Currently, updating an existing AKS cluster to enable workload identity and/or Azure RBAC is not supported. For more information, see [Use Azure RBAC for Kubernetes authorization](/azure/aks/hybrid/azure-rbac-23h2) or [Deploy and configure Workload Identity for your cluster](workload-identity.md).
@@ -253,3 +257,4 @@ az aksarc delete --name $aksclustername --resource-group $resource_group
 ## Next steps
 
 - [Troubleshoot and known issues with cluster provisioning from Azure](aks-known-issues.md)
+6

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

@@ -4,7 +4,7 @@ description: Create Kubernetes clusters using the Azure portal.
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 01/30/2024
+ms.date: 02/26/2025
 ms.reviewer: guanghu
 ms.lastreviewed: 01/30/2024
 ---
@@ -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":::
@@ -48,8 +48,9 @@ This article describes how to create Kubernetes clusters in Azure Local using th
    - **Primary node pool**:
      - You can leave the default values selected, or change the default value from the drop down list.
    - **SSH Keys**
-     - Configure SSH access to the underlying VMs in your Kubernetes nodes for troubleshooting operations. You must provide an existing SSH public key.
-     - Provide an RSA public key in the single line format (starting with "ssh-rsa") or the multi-line PEM format. You can generate SSH keys using PuTTYGen on Windows.
+     - SSH keys are essential for troubleshooting and log collection. Be sure to save your private key file for future use.
+     - You can use an existing SSH key or generate a new key pair during cluster creation. For information about how to create new SSH keys from the Azure portal, see [Create and store SSH keys in the portal](/azure/virtual-machines/ssh-keys-portal#generate-new-keys).
+     - To **Use an existing public key by providing the SSH public key value**, provide an RSA public key in the single line format (starting with "ssh-rsa") or the multi-line PEM format.
 
 1. Select **Next: Node pools** when complete.
 1. On the **Node pools** page, configure the following options:

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

@@ -4,7 +4,7 @@ description: Basic networking concepts for AKS Edge Essentials
 author: sethmanheim
 ms.author: sethm
 ms.topic: conceptual
-ms.date: 07/11/2024
+ms.date: 03/10/2025
 ms.custom: template-concept
 ---
 
@@ -99,7 +99,7 @@ It's possible to check the DNS servers being used for both Linux and Windows nod
     Invoke-AksEdgeNodeCommand -NodeType Linux -command "resolvectl status"
     ```
 
-    The command output shows a list of the DNS servers configured for each Linux VM interfaces. In particular, it's important to check the **eth0** interface status, which is the default interface for the AKS EE VM communication. Also, make sure to check the IP addresses of the **Current DNS Server** and **DNS Servers** fields of the list. If there's no IP address, or the IP address isn't a valid DNS server IP address, then the DNS service won't work.
+    The command output shows a list of the DNS servers configured for each Linux VM interfaces. In particular, it's important to check the **eth0** interface status, which is the default interface for the AKS Edge Essentials VM communication. Also, make sure to check the IP addresses of the **Current DNS Server** and **DNS Servers** fields of the list. If there's no IP address, or the IP address isn't a valid DNS server IP address, then the DNS service won't work.
 
 - For Windows VM nodes:
 

AKS-Arc/aks-edge-concept-networking.md

@@ -4,7 +4,7 @@ description: Description of deployment configuration JSON parameters in AKS Edge
 author: sethmanheim
 ms.author: sethm
 ms.topic: conceptual
-ms.date: 07/11/2024
+ms.date: 03/10/2025
 ms.custom: template-concept
 ---
 
@@ -21,6 +21,7 @@ You can find the complete JSON schema file at `C:\Program Files\AksEdge\aksedge-
 | `DeploymentType` |[`SingleMachineCluster` / `ScalableCluster`]| Specifies deployment type. In `ScalableCluster`, you can add more machines to the cluster infrastructure. | `SingleMachineCluster` |Single-machine and full deployment|
 | `Init.ServiceIPRangeStart` |IPv4 address `A.B.C.x`.|Reserved IP start address for your Kubernetes services. This IP range must be free on your subnet **A.B.C.0**.| None |Single-machine and full deployment|
 | `Init.ServiceIPRangeSize` |`[0-127]`|Number of reserved IP start addresses for your Kubernetes services. Based on the size, we allocate a range of free IP addresses on your subnet. | `0` |Single-machine and full deployment|
+| `Init.KmsPlugin.Enable` | Boolean | Specifies whether the KMS plugin is enabled or not. | false | Single-machine and full deployment|
 | `Join.ClusterJoinToken` |String|`Reserved` | None |Full deployment only|
 | `Join.DiscoveryTokenHash` |String|`Reserved`| None |Full deployment only|
 | `Join.CertificateKey` |String|`Reserved`| None |Full deployment only|

AKS-Arc/aks-edge-deployment-config-json.md

@@ -4,14 +4,17 @@ description: Connect your AKS Edge Essentials clusters to Arc
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 09/27/2024
+ms.date: 03/10/2025
 ms.custom: template-how-to
 ---
 
 # Connect your AKS Edge Essentials cluster to Arc
 
 This article describes how to connect your AKS Edge Essentials cluster to [Azure Arc](/azure/azure-arc/kubernetes/overview) so that you can monitor the health of your cluster on the Azure portal. If your cluster is connected to a proxy, you can use the scripts provided in the GitHub repo to connect your cluster to Arc [as described here](./aks-edge-howto-more-configs.md).
 
+> [!IMPORTANT]
+> Starting with the AKS Edge Essentials 1.10.868.0 release, the `Arc` section of the config file is required. The Azure Arc connection occurs automatically after you run `New-AksEdgeDeployment` to deploy an AKS Edge Essentials cluster.
+
 ## Prerequisites
 
 - Before connecting to Arc, infrastructure administrators who are the owner or contributor role of the subscription will have to: