Merge pull request #3481 from MicrosoftDocs/main638732701619357869sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

AKS-Arc/workload-identity.md

@@ -4,7 +4,8 @@ description: Learn how to deploy and configure an AKS Arc cluster with workload
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 11/08/2024
+ms.date: 01/23/2025
+ms.reviewer: leslielin
 
 ---
 
@@ -167,16 +168,32 @@ $MSIPrincipalId=$(az identity show --resource-group $resource_group_name --name
 
 ### Create a Kubernetes service account
 
-Create a Kubernetes service account and annotate it with the client ID of the managed identity created in the previous step:
+In this step, you create a Kubernetes service account and annotate it with the client ID of the managed identity you created in the previous step.
+
+Use cluster connect to access your cluster from a client device. For more information, see [Access your cluster from a client device](/azure/azure-arc/kubernetes/cluster-connect?tabs=azure-cli%2Cagent-version#access-your-cluster-from-a-client-device):
 
 ```azurecli
 az connectedk8s proxy -n $aks_cluster_name -g $resource_group_name
 ```
 
-Open a new window. Copy and paste the following CLI commands:
+Open a new CLI command window. Copy and paste the following commands:
 
 ```azurecli
-$yaml = @" apiVersion: v1 kind: ServiceAccount metadata: annotations: azure.workload.identity/client-id: $MSIId name: $SERVICE_ACCOUNT_NAME namespace: $SERVICE_ACCOUNT_NAMESPACE "@ $yaml = $yaml -replace '\$MSIId', $MSIId ` -replace '\$SERVICE_ACCOUNT_NAME', $SERVICE_ACCOUNT_NAME ` -replace '\$SERVICE_ACCOUNT_NAMESPACE', $SERVICE_ACCOUNT_NAMESPACE $yaml | kubectl apply -f -
+$yaml = @"
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations:
+    azure.workload.identity/client-id: $MSIId
+  name: $SERVICE_ACCOUNT_NAME
+  namespace: $SERVICE_ACCOUNT_NAMESPACE
+"@
+
+$yaml = $yaml -replace '\$MSIId', $MSIId `
+               -replace '\$SERVICE_ACCOUNT_NAME', $SERVICE_ACCOUNT_NAME `
+               -replace '\$SERVICE_ACCOUNT_NAMESPACE', $SERVICE_ACCOUNT_NAMESPACE
+
+$yaml | kubectl apply -f -
 ```
 
 The following output shows successful creation of the service account:

azure-local/TOC.yml

@@ -590,6 +590,8 @@ items:
         href: migrate/migrate-vmware-migrate.md
       - name: Enable guest management
         href: migrate/migrate-enable-guest-management.md
+    - name: Maintain static IP addresses
+      href: migrate/migrate-maintain-ip-addresses.md
     - name: FAQ
       href: migrate/migrate-faq.yml
     - name: Troubleshoot

azure-local/deploy/deployment-azure-arc-gateway-overview.md

@@ -102,25 +102,25 @@ As part of the Azure Local version 2411.1 preview update, the endpoints from the
 | 6 | `http://gbl.his.arc.azure.com:443` | Arc registration |  
 | 7 | `http://<region>.his.arc.azure.com:443` | Arc registration |
 | 8 | `http://dc.services.visualstudio.com:443` | Arc registration |
-| 9 | `http://<yourarcgatewayId>.gw.arc.azure.com:443` | Arc gateway |
-| 10 | `http://<yourkeyvaultname>.vault.azure.net:443` | Azure Key Vault |
-| 11 | `http://<yourblobstorageforcloudwitnessname>.blob.core.windows.net:443` | Cloud Witness Storage Account |
-| 12 | `http://files.pythonhosted.org:443` | Microsoft On-premises Cloud/ARB/AKS |
-| 13 | `http://pypi.org:443` | Microsoft On-premises Cloud/ARB/AKS |
-| 14 | `http://raw.githubusercontent.com:443` | Microsoft On-premises Cloud/ARB/AKS |
-| 15 | `http://pythonhosted.org:443` | Microsoft On-premises Cloud/ARB/AKS |
-| 16 | `http://ocsp.digicert.com`  | Certificate Revocation List for Arc extensions |
-| 17 | `http://s.symcd.com` | Certificate Revocation List for Arc extensions |
-| 18 | `http://ts-ocsp.ws.symantec.com` | Certificate Revocation List for Arc extensions |
-| 19 | `http://ocsp.globalsign.com` | Certificate Revocation List for Arc extensions |
-| 20 | `http://ocsp2.globalsign.com` | Certificate Revocation List for Arc extensions |
-| 21 | `http://oneocsp.microsoft.com` | Certificate Revocation List for Arc extensions |
-| 22 | `http://dl.delivery.mp.microsoft.com` | Windows Update |
-| 23 | `http://*.tlu.dl.delivery.mp.microsoft.com` | Windows Update |
-| 24 | `http://*.windowsupdate.com` | Windows Update |
-| 25 | `http://*.windowsupdate.microsoft.com` | Windows Update |
-| 26 | `http://*.update.microsoft.com` | Windows Update |
-
+| 9 | `https://<region>.obo.arc.azure.com:8084` | AKS extensions |
+| 10 | `http://<yourarcgatewayId>.gw.arc.azure.com:443` | Arc gateway |
+| 11 | `http://<yourkeyvaultname>.vault.azure.net:443` | Azure Key Vault |
+| 12 | `http://<yourblobstorageforcloudwitnessname>.blob.core.windows.net:443` | Cloud Witness Storage Account |
+| 13 | `http://files.pythonhosted.org:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 14 | `http://pypi.org:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 15 | `http://raw.githubusercontent.com:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 16 | `http://pythonhosted.org:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 17 | `http://ocsp.digicert.com`  | Certificate Revocation List for Arc extensions |
+| 18 | `http://s.symcd.com` | Certificate Revocation List for Arc extensions |
+| 19 | `http://ts-ocsp.ws.symantec.com` | Certificate Revocation List for Arc extensions |
+| 20 | `http://ocsp.globalsign.com` | Certificate Revocation List for Arc extensions |
+| 21 | `http://ocsp2.globalsign.com` | Certificate Revocation List for Arc extensions |
+| 22 | `http://oneocsp.microsoft.com` | Certificate Revocation List for Arc extensions |
+| 23 | `http://dl.delivery.mp.microsoft.com` | Windows Update |
+| 24 | `http://*.tlu.dl.delivery.mp.microsoft.com` | Windows Update |
+| 25 | `http://*.windowsupdate.com` | Windows Update |
+| 26 | `http://*.windowsupdate.microsoft.com` | Windows Update |
+| 27 | `http://*.update.microsoft.com` | Windows Update |
 
 ## Restrictions and limitations
 

azure-local/migrate/media/migrate-maintain-ip-addresses/compute-network.png

@@ -6,7 +6,7 @@ metadata:
   author: alkohli
   ms.author: alkohli
   ms.service: azure-local
-  ms.date: 12/10/2024
+  ms.date: 01/23/2025
 
 title: FAQ - Migration of Hyper-V and VMware VMs to Azure Local using Azure Migrate (preview)
 
@@ -86,7 +86,7 @@ sections:
 
           ### My source VMs use static IP addresses. Are these addresses preserved when I migrate my VMs to Azure Local?
         
-          Currently both VMware and Hyper-V migrations only support VMs configured with DHCP. For a source VM with a static IP address, first migrate it to the target Azure Local system. After the migration, connect to the VM using Hyper-V Manager and manually change the IP configuration.
+          In this release, static IP addresses can be preserved during migration for Windows VMs on VMware and Hyper-V. Linux VMs are not supported. For more details, see [Maintain static IP addresses](migrate-maintain-ip-addresses.md).
 
           ### I use DHCP reservation for IP addresses for my source VMs. Does migration ensure that the MAC address is preserved so that my migrated VM can get the same IP address? 
         
@@ -114,12 +114,12 @@ sections:
 
           Within the Azure Migrate portal, you can select up to 10 machines at once for replication. To replicate more machines, add in batches of 10 (agentless migration overview).
 
-          Each Azure migrate appliance supports replication of 52 disks in parallel (scheduling logic).
+          Each Azure Migrate appliance supports replication of 52 disks in parallel (scheduling logic).
 
-          For example, if you selected to replicate 100 VMs (in batches of 10), with each VM containing two disks each, resulting in 200 (100 x 2) disks in total. The Azure migrate appliance starts replicating 52 disks in parallel. As soon as one disk finishes initial replication, the next disk immediately takes its spot in the queue, while still continuously replicating the remaining 52 disks. This continues with all the remaining disks until all 200 disks have been replicated.
+          For example, if you selected to replicate 100 VMs (in batches of 10), with each VM containing two disks each, resulting in 200 (100 x 2) disks in total. The Azure Migrate appliance starts replicating 52 disks in parallel. As soon as one disk finishes initial replication, the next disk immediately takes its spot in the queue, while still continuously replicating the remaining 52 disks. This continues with all the remaining disks until all 200 disks have been replicated.
 
           ## [Hyper-V VMs only](#tab/hyper-v-vms)
           
-          ### I have a VM running on an older Hyper-V servers - for example, Windows Server 2012 or Windows Server 2008 R2. Can I migrate this VM to Azure Local?
+          ### I have a VM running on an older Hyper-V server - for example, Windows Server 2012 or Windows Server 2008 R2. Can I migrate this VM to Azure Local?
 
           Yes. The migration solution discovers VMs on all the Windows Server hosts starting from Windows Server 2012 R2 and up to Windows Server 2022.