[BUG] Fix #49 #37 (#51)

* [BUG] InvalidSubscriptionId whenconnectingtoArc#49 * Remove PolicyInsights
Azure · Jan 24, 2023 · 9e3ca9b · 9e3ca9b
1 parent e273367
commit 9e3ca9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tools/modules/AksEdgeDeploy/AksEdge-Arc.ps1 b/tools/modules/AksEdgeDeploy/AksEdge-Arc.ps1
@@ -17,7 +17,7 @@ New-Variable -Option Constant -ErrorAction SilentlyContinue -Name azcmagentexe -
 
 New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arciotEnvConfig -Value @{
     "RPNamespaces"  = @("Microsoft.HybridCompute", "Microsoft.GuestConfiguration", "Microsoft.HybridConnectivity",
-        "Microsoft.Kubernetes", "Microsoft.KubernetesConfiguration", "Microsoft.ExtendedLocation", "Microsoft.PolicyInsights")
+        "Microsoft.Kubernetes", "Microsoft.KubernetesConfiguration", "Microsoft.ExtendedLocation")
     "ArcExtensions" = @("MicrosoftMonitoringAgent", "CustomScriptExtension")
     "ReqRoles"      = @("Azure Connected Machine Onboarding", "Kubernetes Cluster - Azure Arc Onboarding")
     "AzExtensions"  = @("connectedmachine", "connectedk8s", "customlocation", "k8s-extension")
@@ -469,7 +469,8 @@ function Get-AideArcServerInfo {
     }
     $vmInfo = @{}
     $apiVersion = "2020-06-01"
-    $InstanceUri = $env:IMDS_ENDPOINT + "/metadata/instance?api-version=$apiVersion"
+    $imdsEndpoint = [System.Environment]::GetEnvironmentVariable("IMDS_ENDPOINT","Machine")
+    $InstanceUri = $imdsEndpoint + "/metadata/instance?api-version=$apiVersion"
     $Proxy = New-Object System.Net.WebProxy
     $WebSession = New-Object Microsoft.PowerShell.Commands.WebRequestSession
     $WebSession.Proxy = $Proxy
@@ -640,7 +641,8 @@ function Get-AideArcServerSMI {
     $token = $null
     $apiVersion = "2020-06-01"
     $resource = "https://management.azure.com/"
-    $endpoint = "{0}?resource={1}&api-version={2}" -f $env:IDENTITY_ENDPOINT, $resource, $apiVersion
+    $idEndpoint = [System.Environment]::GetEnvironmentVariable("IDENTITY_ENDPOINT","Machine")
+    $endpoint = "{0}?resource={1}&api-version={2}" -f $idEndpoint, $resource, $apiVersion
     $secretFile = ""
     try {
         Invoke-WebRequest -Method GET -Uri $endpoint -Headers @{Metadata = 'True' } -UseBasicParsing

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.230119.1200'
+    ModuleVersion     = '1.0.230123.1500'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()