Add support for connectedmachinename parameter

Azure · Oct 2, 2024 · c0373e4 · c0373e4
1 parent 2ecc6df
commit c0373e4
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/tools/aide-userconfig.json b/tools/aide-userconfig.json
@@ -1,5 +1,5 @@
 {
-    "SchemaVersion": "1.1",
+    "SchemaVersion": "1.2",
     "Version": "1.0",
     "AksEdgeProduct": "AKS Edge Essentials - K3s",
     "AksEdgeProductUrl": "",
@@ -22,7 +22,8 @@
         "Auth": {
             "ServicePrincipalId": "",
             "Password": ""
-        }
+        },
+        "ConnectedMachineName": ""
     },
     "AksEdgeConfigFile": "aksedge-config.json"
 }
diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1
@@ -91,7 +91,7 @@ function Install-AideArcServer {
     Push-Location $env:TEMP
     try {
         # Download the installation package
-        Invoke-WebRequest -Uri "https://aka.ms/azcmagent-windows" -TimeoutSec 30 -OutFile "$env:TEMP\install_windows_azcmagent.ps1"
+        Invoke-WebRequest -Uri "https://aka.ms/azcmagent-windows" -TimeoutSec 300 -OutFile "$env:TEMP\install_windows_azcmagent.ps1"
         # Install the hybrid agent
         & "$env:TEMP\install_windows_azcmagent.ps1"
         if ($LASTEXITCODE -ne 0) {
@@ -260,6 +260,9 @@ function Connect-AideArcServer {
         $tags += @("--tags","AKSEE=$clustername")
     }
     $connectargs += $tags
+    if ($aicfg.ConnectedMachineName) {
+        $connectargs += @("--resource-name","$($aicfg.ConnectedMachineName)")
+    }
     $hostSettings = Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings' | Select-Object ProxyServer, ProxyEnable
     if ($hostSettings.ProxyEnable) {
         & $azcmagentexe config set proxy.url $($hostSettings.ProxyServer)

diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy.png b/tools/modules/AksEdgeDeploy/AksEdgeDeploy.png
diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'AksEdgeDeploy.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.0.240904.1500'
+    ModuleVersion     = '1.0.241002.1000'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/tools/modules/AksEdgeDeploy/README.md b/tools/modules/AksEdgeDeploy/README.md
@@ -67,7 +67,7 @@ Find below the details of the supported parameters in the json file.
 
 |Node| Parameter | Required | Type / Values | Comments |
 |-| --------- | -------- |---------------- | -------- |
-|SchemaVersion| - | Mandatory | 1.1 | Fixed value, schema version. Reserved  |
+|SchemaVersion| - | Mandatory | 1.2 | Fixed value, schema version. Reserved  |
 |Version| - | Mandatory | 1.0 | Fixed value, json instance version  |
 |AksEdgeProduct| - | Mandatory | AKS Edge Essentials - K8s <br> AKS Edge Essentials - K3s | Desired product K8s or K3s |
 |AksEdgeProductUrl| - | Optional | URL | URL to download the MSI  |
@@ -81,6 +81,7 @@ Find below the details of the supported parameters in the json file.
 || CustomLocationOID | Optional | GUID | ObjectID for the custom location resource provider  |
 || `Auth`.ServicePrincipalId |Mandatory | GUID | Specify service principal appID to use|
 || `Auth`.Password |Mandatory| String | Specify the password (in clear) |
+|| ConnectedMachineName |Optional| String | Specify the resource name for connected machine agent. Default is hostname |
 |InstallOptions| InstallPath | Optional | String |  Path to install the product  |
 || VhdxPath | Optional | String | Path to store the vhdx files  |
 |VSwitch| Name | Optional | String | Name for the external switch, mandatory for ScalableCluster|
@@ -94,7 +95,6 @@ Find below the details of the supported parameters in the json file.
 
 ![AksEdge Schema json](AksEdgeSchema.png)
 
-
 ## AKS Edge Essentials Arc Connection
 
 The following functions enables you to install and use `Arc enabled Servers` and `Arc enabled Kubernetes` easily on a windows IoT device.

diff --git a/tools/modules/AksEdgeDeploy/aide-ucschema.json b/tools/modules/AksEdgeDeploy/aide-ucschema.json
@@ -6,7 +6,7 @@
     "properties": {
         "SchemaVersion": {
             "type": "string",
-            "default": "1.1",
+            "default": "1.2",
             "description": "Version of the schema/format of the json"
         },
         "Version": {
@@ -72,6 +72,10 @@
                             "description": "Password corresponding to ServicePrincipalId to onboard Arc-enabled Server/Kubernetes"
                         }
                     }
+                },
+                "ConnectedMachineName":{
+                    "type": "string",
+                    "description": "Connected Machine name used for Azure Arc enabled Server"
                 }
             }
         },

diff --git a/tools/modules/AksEdgeDeploy/aide-userconfig.puml b/tools/modules/AksEdgeDeploy/aide-userconfig.puml
@@ -11,7 +11,7 @@ jsonDiagram {
     }
     arrow {
         LineThickness 0.5
-        LineStyle 2;6
+        LineStyle 2,6
     }
     highlight {
         BackgroundColor black
@@ -21,7 +21,7 @@ jsonDiagram {
 </style>
 #highlight "SchemaVersion"
 {
-    "SchemaVersion":"1.1",
+    "SchemaVersion":"1.2",
     "Version":"1.0",
     "AksEdgeProduct" : [
                 "AKS Edge Essentials - K8s",
@@ -40,7 +40,8 @@ jsonDiagram {
         "Auth": {
             "ServicePrincipalId" : "GUID",
             "Password" : "String"
-        }
+        },
+        "ConnectedMachineName": "String"
     }
     ,
     "InstallOptions":{