Pull in updates from Main

Arc VMs Extension Compatibility.md

@@ -1,6 +1,7 @@
 |Release Build|Release Series| vmss-hci | stack-hci-vm |API Version|
 |--|--|--|--|--|
-|10.2503.0.13 |2503  | 5.6.29 |1.6.5    | 2024-10-01-preview |
+|10.2504.0.21 |2504  | 5.8.11 |1.7.9    | 2025-04-01-preview  |
+|10.2503.0.13 |2503  | 5.7.29 |1.6.5    | 2024-10-01-preview |
 |10.2411.3.2  |2411.3| 5.6.10 |1.5.0    | 2024-08-01-preview |
 |10.2411.2.12 |2411.2| 5.6.10 |1.5.0    | 2024-08-01-preview |
 |10.2411.1.10 |2411.1| 5.5.5  |1.5.0    | 2024-08-01-preview |

os-image/os-image-tracking-table.md

@@ -6,6 +6,9 @@ When you add a machine or repair a machine, make sure to deploy the correct vers
 
 | To deploy this OS image on Azure Local machine... | Download OS image from this location |
 |------------------|------------------|
+| 10.2411.3.2 or earlier | Download image from [https://aka.ms/hcireleaseimage/2411.3](https://aka.ms/hcireleaseimage/2411.3). |
 | 10.2503.0.13 | Download 2503 image from the Azure portal. |
-| 11.2504.1001.19 | Download this image from [https://aka.ms/hcireleaseimage/11.2504](https://aka.ms/hcireleaseimage/11.2504) |
+| 11.2504.1001.19 | Download this image from [https://aka.ms/hcireleaseimage/11.2504](https://aka.ms/hcireleaseimage/11.2504). |
 | 12.2504.1001.20 | Download 2504 image from the Azure portal. |
+<!--| 11.2505.1001.22 | Download this image from [https://aka.ms/hcireleaseimage/11.2505](https://aka.ms/hcireleaseimage/11.2505). |
+| 12.2505.1001.23 | Download 2505 image from the Azure portal. |-->

templates/2025_04/README.md

@@ -1,19 +1,23 @@
 ## CREATE FABRIC-NETWORKING RESOURCES
-'''
+```
 az deployment group create -c -g <RG name> -c --template-file fabric_networking.jsonc --parameters fabric_networking.parameters.jsonc
-  az networkfabric l3domain update-admin-state --resource-name "XX-ISDL3" -g "<RG name>" --state Enable	
-'''
+```
+```
+az networkfabric l3domain update-admin-state --resource-name "<L3-isd-name>" -g "<RG name>" --state Enable	
+```
 
 ## CREATE NC-NETWORKING RESOURCES
-'''
+```
 az deployment group create -c -g <RG name> -c --template-file nc_networking.jsonc --parameters nc_networking.parameters.jsonc				
-'''
+```
 ## CREATE VM
-'''
-az deployment group create -c -g <RG name> -c --template-file vm.jsonc --parameters vm.parameters.jsonc				
-    az ssh arc --local-user azureuser --resource-group <RG name> --name alrs-vm --private-key-file .ssh/id_rsa				
-'''
+```
+az deployment group create -c -g <RG name> -c --template-file vm.jsonc --parameters vm.parameters.jsonc
+```
+```
+az ssh arc --local-user azureuser --resource-group <RG name> --name <vm-name> --private-key-file <vm-key.pub>				
+```
 ## CREATE A NEW SSHKEY
-'''
-ssh-keygen -t rsa -b 4096 -f ~/.ssh/my_vm_key
-'''
+```
+ssh-keygen -t rsa -b 4096 -f vm_key
+```

templates/2025_04/vm.parameters.jsonc

@@ -9,16 +9,16 @@
             "value": "2024-08-01-preview"
         },
         "customLocationId": {
-            "value": "/subscriptions/abcd-1234-5678-efgh/resourceGroups/blabla-HostedResources-blabla/providers/Microsoft.ExtendedLocation/customLocations/dev10-blabla-cstm-loc"
+            "value": ""
         },           
         "location": {
             "value": "eastus"
         },
         "acrImagePath": {
-            "value": "acrreg.azurecr.io/ubuntu:22.04.00"
+            "value": ""
         },
         "acrUsername": {
-            "value": "acrreg"
+            "value": ""
         },
         "acrPassword": {
             "value": ""
@@ -27,13 +27,13 @@
             "value": ""
         },
         "l3nId01": {
-            "value": "/subscriptions/abcd-1234-5678-efgh/resourceGroups/bsd-ALRS-P1-test/providers/Microsoft.NetworkCloud/l3Networks/oam"
+            "value": ""
         },
         "l3nId02": {
-            "value": "/subscriptions/abcd-1234-5678-efgh/resourceGroups/bsd-ALRS-P1-test/providers/Microsoft.NetworkCloud/l3Networks/appdata"
+            "value": ""
         },
         "csnId": {
-            "value": "/subscriptions/abcd-1234-5678-efgh/resourceGroups/bsd-ALRS-P1-test/providers/Microsoft.NetworkCloud/cloudServicesNetworks/bsd-csn-alrs"
+            "value": ""
         },
         "vmMemoryMB": {
             "value": 8192
@@ -42,7 +42,7 @@
             "value": 4
         },
         "ssh-keydata": {
-            "value": "sshkeydata"
+            "value": ""
         }
   }
-}
+}