Fix merge conflicts

Author: sethmanheim

.openpublishing.publish.config.json

@@ -92,6 +92,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-reference-other-repo",
+      "url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "quickstart-templates",
       "url": "https://github.com/Azure/azure-quickstart-templates",

.openpublishing.redirection.aks.json

@@ -1355,6 +1355,11 @@
         "redirect_url": "/azure/aks/hybrid/manage-node-pools",
         "redirect_document_id": false
       },
+      {
+        "source_path": "AKS-Hybrid/manage-control-plane-nodes.md",
+        "redirect_url": "/azure/aks/hybrid/manage-node-pools",
+        "redirect_document_id": false
+      },
       {
         "source_path": "AKS-Hybrid/deploy-metallb.md",
         "redirect_url": "/azure/aks/hybrid/deploy-load-balancer",
@@ -1365,6 +1370,16 @@
         "redirect_url": "/azure/aks/hybrid/aks-get-kubelet-logs",
         "redirect_document_id": false
       },
+      {
+        "source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgebillingpodstate.md",
+        "redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgenodeconnectivitymode.md",
+        "redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
+        "redirect_document_id": false
+      },
       {
         "source_path": "AKS-Hybrid/aks-hci-evaluation-guide.md",
         "redirect_url": "/azure/aks/hybrid/overview",

.openpublishing.redirection.json

@@ -1,5 +1,25 @@
 {
   "redirections": [
+    {
+      "source_path":"azure-stack/hci/manage/bitlocker-on-csv.md",
+      "redirect_url":"/azure-stack/hci/manage/manage-bitlocker",
+      "redirect_document_id": false
+    },
+    {
+      "source_path":"azure-stack/hci/manage/install-preview-version.md",
+      "redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
+      "redirect_document_id": false
+    },
+    {
+      "source_path":"azure-stack/hci/manage/network-atc-faq.md",
+      "redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
+      "redirect_document_id": false
+    },
+    {
+      "source_path":"azure-stack/hci/manage/preview-post-installation.md",
+      "redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
+      "redirect_document_id": false
+    },
     {
       "source_path":"azure-stack/hci/manage/preview-channel.md",
       "redirect_url":"/azure-stack/hci/deploy/download-azure-stack-hci-23h2-software",
@@ -145,6 +165,16 @@
       "redirect_url":"/azure/active-directory/develop/howto-create-service-principal-portal", 
       "redirect_document_id":false
     },
+    { 
+      "source_path":"azure-stack/operator/azure-stack-provision-storage-account.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-manage-storage-accounts", 
+      "redirect_document_id":false
+    },
+    { 
+      "source_path":"azure-stack/user/azure-stack-connect-azure-stack.md", 
+      "redirect_url":"/azure-stack/user/azure-stack-powershell-configure-user", 
+      "redirect_document_id":false
+    },
     { 
       "source_path":"azure-stack/operator/app-service-known-issues-v0.md", 
       "redirect_url":"/azure-stack/operator/app-service-release-notes-2021-q1#known-issues-update", 
@@ -160,6 +190,91 @@
       "redirect_url":"/azure-stack/operator/app-service-release-notes-2020-q2#known-issues-update", 
       "redirect_document_id":false
     },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-five.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-six.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-four.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-one.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-seven.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-two.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-three.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/app-service-release-notes-2020-Q2.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/app-service-release-notes-2020-Q3.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11300.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11330.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11930.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-mysql-resource-provider-11300.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-mysql-resource-provider-11330.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-mysql-resource-provider-11930.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/ruggedized/operator/azure-stack-manage-basics-tzl.md", 
+      "redirect_url":"/azure-stack/ruggedized/ruggedized-overview", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/ruggedized/operator/azure-stack-windows-server-faq-tzl.md", 
+      "redirect_url":"/azure-stack/ruggedized/ruggedized-overview", 
+      "redirect_document_id":false
+    },    
     { 
       "source_path":"azure-stack/operator/known-issues-vn.md", 
       "redirect_url":"/azure-stack/operator/known-issues", 
@@ -215,6 +330,16 @@
       "redirect_url":"/azure-stack/operator/hotfix-1-2108-2-83", 
       "redirect_document_id":false
     },        
+    { 
+      "source_path":"azure-stack/operator/hotfix-1-2008-41-163.md", 
+      "redirect_url":"/azure-stack/operator/hotfix-1-2008-41-161", 
+      "redirect_document_id":false
+    },            
+    { 
+      "source_path":"azure-stack/operator/hotfix-1-2301-2-58.md", 
+      "redirect_url":"/azure-stack/operator/hotfix-1-2301-2-64", 
+      "redirect_document_id":false
+    },            
     { 
       "source_path":"azure-stack/operator/relnotearchive/release-notes-known-issues-1802.md", 
       "redirect_url":"/azure-stack/operator/relnotearchive/release-notes?view=azs-1802", 
@@ -330,6 +455,16 @@
       "redirect_url":"/azure-stack/operator/relnotearchive/release-notes?view=azs-1910", 
       "redirect_document_id":false
     },                          
+    { 
+      "source_path":"azure-stack/operator/relnotearchive/known-issues-2002.md", 
+      "redirect_url":"/azure-stack/operator/relnotearchive/known-issues?view=azs-2002", 
+      "redirect_document_id":false
+    },                          
+    { 
+      "source_path":"azure-stack/operator/relnotearchive/release-notes-2002.md", 
+      "redirect_url":"/azure-stack/operator/relnotearchive/release-notes?view=azs-2002", 
+      "redirect_document_id":false
+    },                          
     { 
       "source_path":"azure-stack/mdc/customer-journey.md", 
       "redirect_url":"/azure-stack/mdc/integration-overview", 

AKS-Hybrid/TOC.yml

@@ -98,6 +98,8 @@
         href: cluster-labels.md
       - name: Taints
         href: aks-arc-use-node-taints.md
+      - name: Use availability sets
+        href: availability-sets.md
     - name: Scale a Kubernetes cluster
       href: auto-scale-aks-arc.md
     - name: Upgrade Kubernetes clusters

AKS-Hybrid/aks-arc-diagnostic-checker.md

@@ -97,9 +97,9 @@ param (
 $urlArray = @(
     "https://management.azure.com",
     "https://eastus.dp.kubernetesconfiguration.azure.com",
-    "https://log in.microsoftonline.com",
-    "https://eastus.log in.microsoft.com",
-    "https://log in.windows.net",
+    "https://login.microsoftonline.com",
+    "https://eastus.login.microsoft.com",
+    "https://login.windows.net",
     "https://mcr.microsoft.com",
     "https://gbl.his.arc.azure.com",
     "https://k8connecthelm.azureedge.net",

AKS-Hybrid/aks-edge-howto-connect-to-arc.md

@@ -4,7 +4,7 @@ description: Connect your AKS Edge Essentials clusters to Arc
 author: rcheeran
 ms.author: rcheeran
 ms.topic: how-to
-ms.date: 04/16/2024
+ms.date: 08/21/2024
 ms.custom: template-how-to
 ---
 
@@ -14,6 +14,8 @@ This article describes how to connect your AKS Edge Essentials cluster to [Azure
 
 ## Prerequisites
 
+In addition to these prerequisites, be sure to meet all [network requirements for Azure Arc-enabled Kubernetes](/azure/azure-arc/kubernetes/network-requirements).
+
 - You need an Azure subscription with either the **Owner** role or a combination of **Contributor** and **User Access Administrator** roles. You can check your access level by navigating to your subscription on the Azure portal, selecting **Access control (IAM)** on the left-hand side of the Azure portal, and then selecting **View my access**. See [the Azure documentation](/azure/azure-resource-manager/management/manage-resource-groups-portal) for more information about managing resource groups.
 - Enable all required resource providers in the Azure subscription, such as **Microsoft.HybridCompute**, **Microsoft.GuestConfiguration**, **Microsoft.HybridConnectivity**, **Microsoft.Kubernetes**, **Microsoft.ExtendedLocation**, and **Microsoft.KubernetesConfiguration**.
 - Create and verify a resource group for AKS Edge Essentials Azure resources.

AKS-Hybrid/aks-edge-howto-multi-node-deployment.md

@@ -27,7 +27,9 @@ You can generate the parameters needed to create a scalable cluster using the fo
 New-AksEdgeConfig -DeploymentType ScalableCluster -outFile .\aksedge-config.json | Out-Null
 ```
 
-This creates a configuration file called **aksedge-config.json** which includes the configuration needed to create a scalable cluster with a Linux node. The file is created in your current working directory. See the following examples for more options for creating the configuration file. A detailed description of the configuration parameters [is available here](aks-edge-deployment-config-json.md).
+This command creates a configuration file named **aksedge-config.json**, which includes the configuration needed to create a scalable cluster with a Linux node. The file is created in your current working directory. See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for detailed descriptions of the configuration parameters (such as proxy settings).
+
+See the following examples for more options for creating the configuration file.
 
 The key parameters to note for a scalable Kubernetes deployment are:
 

AKS-Hybrid/aks-edge-howto-setup-machine.md

@@ -4,7 +4,7 @@ description: Learn how to prepare your machines for AKS Edge Essentials clusters
 author: rcheeran
 ms.author: rcheeran
 ms.topic: how-to
-ms.date: 02/13/2024
+ms.date: 09/04/2024
 ms.custom: template-how-to
 ---
 
@@ -26,15 +26,14 @@ You can deploy an AKS Edge Essentials cluster on either a single machine or on m
 
 1. On your machine, download the **AksEdge-k3s.msi** or **AksEdge-k8s.msi** file, depending on which Kubernetes distribution you want to use. Also, if you're creating a Windows worker node, you'll need the Windows node files.
 
-    | File | Link |
-    | ---- | ---- |
-    | K8s installer (1.28.3) | [aka.ms/aks-edge/k8s-msi](https://aka.ms/aks-edge/k8s-msi)  |
-    | K3s installer (1.28.3) | [aka.ms/aks-edge/k3s-msi](https://aka.ms/aks-edge/k3s-msi) |
-    | K8s installer (1.27.6) | [aka.ms/aks-edge/k8s-msi-1.27](https://aka.ms/aks-edge/k8s-msi-1.27) |
-    | K3s installer (1.27.6) | [aka.ms/aks-edge/k3s-msi-1.27](https://aka.ms/aks-edge/k3s-msi-1.27) |
-    | K8s installer (1.26.6) | [aka.ms/aks-edge/k8s-msi-1.26](https://aka.ms/aks-edge/k8s-msi-1.26)  |
-    | K3s installer (1.26.10) | [aka.ms/aks-edge/k3s-msi-1.26](https://aka.ms/aks-edge/k3s-msi-1.26) |
-    | Windows node files | [aka.ms/aks-edge/windows-node-zip](https://aka.ms/aks-edge/windows-node-zip) |
+   | File | Link |
+   | ---- | ---- |
+   | K8s installer (1.29.4) | [aka.ms/aks-edge/k8s-msi](https://aka.ms/aks-edge/k8s-msi)  |
+   | K3s installer (1.29.6) | [aka.ms/aks-edge/k3s-msi](https://aka.ms/aks-edge/k3s-msi) |
+   | K8s installer (1.28.9) | [aka.ms/aks-edge/k8s-msi-1.28](https://aka.ms/aks-edge/k8s-msi-1.28) |
+   | K3s installer (1.28.5) | [aka.ms/aks-edge/k3s-msi-1.28](https://aka.ms/aks-edge/k3s-msi-1.28) |
+   | K8s installer (1.27.6) | [aka.ms/aks-edge/k8s-msi-1.27](https://aka.ms/aks-edge/k8s-msi-1.27)  |
+   | K3s installer (1.27.6) | [aka.ms/aks-edge/k3s-msi-1.27](https://aka.ms/aks-edge/k3s-msi-1.27) |
 
 1. In addition to the MSI, Microsoft provides samples and tools that you can download from the [AKS Edge GitHub repo](https://github.com/Azure/AKS-Edge). Navigate to the **Code** tab and click the **Download Zip** button to download the repository as a **.zip** file. Extract the GitHub **.zip** file to a local folder.
 1. Before you install, make sure you uninstall any private preview installations and reboot your system before proceeding.
@@ -111,6 +110,5 @@ This command displays output similar to the following list:
 
 ## Next steps
 
-- Create a [simple deployment](aks-edge-howto-single-node-deployment.md)
-- Create a [full deployment](aks-edge-howto-multi-node-deployment.md)
-
+- [Create a single machine deployment](aks-edge-howto-single-node-deployment.md)
+- [Create a full Kubernetes deployment](aks-edge-howto-multi-node-deployment.md)

AKS-Hybrid/aks-edge-howto-setup-nested-environment.md

@@ -1,10 +1,10 @@
 ---
 title: Nested virtualization environment for AKS Edge Essentials
 description: Learn how to prepare your nested virtualization environment for AKS Edge Essentials clusters. 
-author: fcabrera23
-ms.author: fcabrera
+author: sethmanheim
+ms.author: sethm
 ms.topic: how-to
-ms.date: 11/28/2023
+ms.date: 09/10/2024
 ms.custom: template-how-to
 ---
 
@@ -13,8 +13,8 @@ ms.custom: template-how-to
 This article describes how to set up a nested virtualization environment to deploy an Azure Kubernetes Service (AKS) Edge Essentials cluster.
 
 > [!NOTE]
-> Deploying AKS Edge Essentials on top of a nested virtualization environment on VMware ESXi is supported per [VMware KB2009916](https://kb.vmware.com/s/article/2009916).
-> Other nested virutalization deployments are not supported for production scenarios and are limited to developer purposes. This guide assumes you're using the Hyper-V hypervisor. We do not support using a non-Microsoft hypervisor, such as KVM.
+> Deploying AKS Edge Essentials on top of a nested virtualization environment on VMware ESXi is supported.
+> Other nested virtualization deployments are not supported for production scenarios and are limited to developer purposes. This guide assumes you're using the Hyper-V hypervisor. We do not support using a non-Microsoft hypervisor, such as KVM.
 
 ## Prerequisites
 
@@ -23,7 +23,7 @@ This article describes how to set up a nested virtualization environment to depl
 
 ## Deployment on Windows VM on VMware ESXi
 
-VMware ESXi [7.0](https://docs.vmware.com/en/VMware-vSphere/7.0/rn/vsphere-esxi-vcenter-server-70-release-notes.html) and [8.0](https://docs.vmware.com/en/VMware-vSphere/8.0/rn/vmware-vsphere-80-release-notes/index.html) versions can host AKS Edge Essentials on top of a Windows virtual machine. See [VMware KB2009916](https://kb.vmware.com/s/article/2009916) for more information about VMware ESXi nested virtualization support.
+VMware ESXi [7.0](https://docs.vmware.com/en/VMware-vSphere/7.0/rn/vsphere-esxi-vcenter-server-70-release-notes.html) and [8.0](https://docs.vmware.com/en/VMware-vSphere/8.0/rn/vmware-vsphere-80-release-notes/index.html) versions can host AKS Edge Essentials on top of a Windows virtual machine.
 
 To set up AKS Edge Essentials on a VMware ESXi Windows virtual machine, use the following steps:
 
@@ -268,7 +268,7 @@ The following guide is an example of IP address allocation. You can use your own
    kubectl get nodes
    ```
 
-   If everything was correctly set up, you should see both Linux nodes running in your cluster
+   If everything was correctly set up, you should see both Linux nodes running in your cluster:
 
    ```output
    PS C:\> kubectl get nodes
@@ -277,6 +277,9 @@ The following guide is an example of IP address allocation. You can use your own
    windows-vm2-ledge        Ready    control-plane,etcd,master  10m25s   v1.24.3+k3s-
    ```
 
+   > [!NOTE]
+   > For a list of currently supported Kubernetes versions on both K3s and K8s, see the table in [Download AKS Edge Essentials](aks-edge-howto-setup-machine.md#download-aks-edge-essentials).
+
 ## Next steps
 
 - Add workloads by [deploying applications](aks-edge-howto-deploy-app.md)

AKS-Hybrid/aks-edge-howto-single-node-deployment.md

@@ -4,7 +4,7 @@ description: Learn how to deploy AKS Edge Essentials on a single machine.
 author: rcheeran
 ms.author: rcheeran
 ms.topic: how-to
-ms.date: 07/11/2024
+ms.date: 08/21/2024
 ms.custom: template-how-to
 ---
 
@@ -24,7 +24,9 @@ You can generate the parameters you need to create a single machine cluster usin
 New-AksEdgeConfig -DeploymentType SingleMachineCluster -outFile .\aksedge-config.json | Out-Null
 ```
 
-This command creates a configuration file called **aksedge-config.json** that includes the configuration needed to create a single-machine cluster with a Linux node. The file is created in your current working directory. See the following examples for more options for creating the configuration file. A detailed description of the configuration parameters [is available here](aks-edge-deployment-config-json.md).
+This command creates a configuration file called **aksedge-config.json** that includes the configuration needed to create a single-machine cluster with a Linux node. The file is created in your current working directory. See the following examples for more options for creating the configuration file.
+
+See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for a detailed description of the configuration parameters.
 
 The key parameters for single machine deployment are:
 
@@ -88,6 +90,9 @@ $machine.LinuxNode.MemoryInMB = 4096
 New-AksEdgeDeployment -JsonConfigString ($jsonObj | ConvertTo-Json -Depth 4)
 ```
 
+> [!TIP]
+> See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for all available options, including network settings such as proxy settings.
+
 ### Create a simple cluster with NodePort service
 
 You can create a simple cluster with no service IPs (`ServiceIPRangeSize` set as 0):