From 08dab7c3a86d228cadd3468272cb4907db879753 Mon Sep 17 00:00:00 2001 From: msanjive-21 Date: Tue, 25 Feb 2025 13:54:31 -0800 Subject: [PATCH 1/4] Update list of supported arc locations --- tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 | 9 +++++---- .../AksEdgeAzureSetup/AksEdgeAzureSetup.ps1 | 11 ++++++----- .../AksEdgeQuickStart/AksEdgeQuickStart-v2.ps1 | 15 ++++++--------- .../AksEdgeQuickStart/AksEdgeQuickStart.ps1 | 15 ++++++--------- .../AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1 | 2 +- 5 files changed, 24 insertions(+), 28 deletions(-) diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 index 5070eb5..16b8408 100644 --- a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 +++ b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 @@ -12,10 +12,11 @@ New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arciotEnvConfi "ArcIotSchema" = @("SubscriptionName", "SubscriptionId", "TenantId", "ResourceGroupName", "Location", "Auth") } New-Variable -option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @( - "westeurope", "eastus", "westcentralus", "southcentralus", "southeastasia", "uksouth", - "eastus2", "westus2", "australiaeast", "northeurope", "francecentral", "centralus", - "westus", "northcentralus", "koreacentral", "japaneast", "eastasia", "westus3", - "canadacentral", "eastus2euap" + "australiaeast","brazilsouth","canadacentral","canadaeast","centralindia","centralus","centraluseuap", + "eastasia","eastus","eastus2","eastus2euap","francecentral","germanywestcentral","israelcentral", + "italynorth","japaneast","koreacentral","northcentralus","northeurope","norwayeast","southafricanorth", + "southcentralus","southeastasia","southindia","swedencentral","switzerlandnorth","uaenorth","uksouth", + "ukwest","westcentralus","westeurope","westus","westus2","westus3" ) function Get-AideArcUserConfig { return (Get-AideUserConfig).Azure diff --git a/tools/scripts/AksEdgeAzureSetup/AksEdgeAzureSetup.ps1 b/tools/scripts/AksEdgeAzureSetup/AksEdgeAzureSetup.ps1 index 80c068e..d2fd5e8 100644 --- a/tools/scripts/AksEdgeAzureSetup/AksEdgeAzureSetup.ps1 +++ b/tools/scripts/AksEdgeAzureSetup/AksEdgeAzureSetup.ps1 @@ -8,16 +8,17 @@ Param( ) #Requires -RunAsAdministrator -New-Variable -Name gAksEdgeAzureSetup -Value "1.0.230829.1100" -Option Constant -ErrorAction SilentlyContinue +New-Variable -Name gAksEdgeAzureSetup -Value "1.0.250225.1400" -Option Constant -ErrorAction SilentlyContinue New-Variable -Option Constant -ErrorAction SilentlyContinue -Name cliMinVersions -Value @{ "azure-cli" = "2.41.0" "azure-cli-core" = "2.41.0" } New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @( - "westeurope", "eastus", "westcentralus", "southcentralus", "southeastasia", "uksouth", - "eastus2", "westus2", "australiaeast", "northeurope", "francecentral", "centralus", - "westus", "northcentralus", "koreacentral", "japaneast", "eastasia", "westus3", - "canadacentral", "eastus2euap" + "australiaeast","brazilsouth","canadacentral","canadaeast","centralindia","centralus","centraluseuap", + "eastasia","eastus","eastus2","eastus2euap","francecentral","germanywestcentral","israelcentral", + "italynorth","japaneast","koreacentral","northcentralus","northeurope","norwayeast","southafricanorth", + "southcentralus","southeastasia","southindia","swedencentral","switzerlandnorth","uaenorth","uksouth", + "ukwest","westcentralus","westeurope","westus","westus2","westus3" ) function Test-AzVersions { #Function to check if the installed az versions are greater or equal to minVersions diff --git a/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart-v2.ps1 b/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart-v2.ps1 index 94fb307..65ea49b 100644 --- a/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart-v2.ps1 +++ b/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart-v2.ps1 @@ -9,17 +9,14 @@ param( [string] $Tag ) #Requires -RunAsAdministrator -New-Variable -Name gAksEdgeQuickStartVersion-v2 -Value "1.0.231206.1130" -Option Constant -ErrorAction SilentlyContinue +New-Variable -Name gAksEdgeQuickStartVersion-v2 -Value "1.0.250225.1400" -Option Constant -ErrorAction SilentlyContinue New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @( - "southcentralus", "westus", "westus2", "westus3", "centralus", "eastus", "eastus2", "eastus3", "westcentralus", "northcentralus", "brazilsouth", - "brazilsoutheast", "canadacentral", "canadaeast", "chilenorthcentral", "mexicocentral", "usgovvirginia", "usdodcentral", "usdodeast", "usgovarizona", - "usgovtexas", "usseceast", "ussecwest", "ussecwestcentral", "eastasia", "southeastasia", "australiaeast", "australiasoutheast", "australiacentral", - "australiacentral2", "chinaeast", "chinaeast2", "chinanorth", "chinanorth2", "chinanorth3", "centralindia", "southindia", "westindia", "indonesiacentral", - "japaneast", "japanwest", "koreacentral", "koreasouth", "malaysiawest", "newzealandnorth", "taiwan", "austriaeast", "belgiumcentral", "denmarkeast", - "northeurope", "westeurope", "finlandcentral", "francecentral", "francesouth", "germanywestcentral", "germanynortheast", "germanycentral", "germanynorth", - "greece", "italynorth", "norwayeast", "norwaywest", "polandcentral", "spaincentral", "swedencentral", "swedensouth", "switzerlandnorth", - "switzerlandwest", "uksouth", "ukwest", "southafricanorth", "southafricawest", "israelcentral", "qatarcentral", "uaenorth", "uaecentral" + "australiaeast","brazilsouth","canadacentral","canadaeast","centralindia","centralus","centraluseuap", + "eastasia","eastus","eastus2","eastus2euap","francecentral","germanywestcentral","israelcentral", + "italynorth","japaneast","koreacentral","northcentralus","northeurope","norwayeast","southafricanorth", + "southcentralus","southeastasia","southindia","swedencentral","switzerlandnorth","uaenorth","uksouth", + "ukwest","westcentralus","westeurope","westus","westus2","westus3" ) New-Variable -Option Constant -ErrorAction SilentlyContinue -Name AksEdgeProductType -Value @( diff --git a/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart.ps1 b/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart.ps1 index 47405a9..a7b3823 100644 --- a/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart.ps1 +++ b/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStart.ps1 @@ -9,17 +9,14 @@ param( [string] $Tag ) #Requires -RunAsAdministrator -New-Variable -Name gAksEdgeQuickStartVersion -Value "1.0.231016.1400" -Option Constant -ErrorAction SilentlyContinue +New-Variable -Name gAksEdgeQuickStartVersion -Value "1.0.250225.1400" -Option Constant -ErrorAction SilentlyContinue New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @( - "southcentralus", "westus", "westus2", "westus3", "centralus", "eastus", "eastus2", "eastus3", "westcentralus", "northcentralus", "brazilsouth", - "brazilsoutheast", "canadacentral", "canadaeast", "chilenorthcentral", "mexicocentral", "usgovvirginia", "usdodcentral", "usdodeast", "usgovarizona", - "usgovtexas", "usseceast", "ussecwest", "ussecwestcentral", "eastasia", "southeastasia", "australiaeast", "australiasoutheast", "australiacentral", - "australiacentral2", "chinaeast", "chinaeast2", "chinanorth", "chinanorth2", "chinanorth3", "centralindia", "southindia", "westindia", "indonesiacentral", - "japaneast", "japanwest", "koreacentral", "koreasouth", "malaysiawest", "newzealandnorth", "taiwan", "austriaeast", "belgiumcentral", "denmarkeast", - "northeurope", "westeurope", "finlandcentral", "francecentral", "francesouth", "germanywestcentral", "germanynortheast", "germanycentral", "germanynorth", - "greece", "italynorth", "norwayeast", "norwaywest", "polandcentral", "spaincentral", "swedencentral", "swedensouth", "switzerlandnorth", - "switzerlandwest", "uksouth", "ukwest", "southafricanorth", "southafricawest", "israelcentral", "qatarcentral", "uaenorth", "uaecentral" + "australiaeast","brazilsouth","canadacentral","canadaeast","centralindia","centralus","centraluseuap", + "eastasia","eastus","eastus2","eastus2euap","francecentral","germanywestcentral","israelcentral", + "italynorth","japaneast","koreacentral","northcentralus","northeurope","norwayeast","southafricanorth", + "southcentralus","southeastasia","southindia","swedencentral","switzerlandnorth","uaenorth","uksouth", + "ukwest","westcentralus","westeurope","westus","westus2","westus3" ) if (! [Environment]::Is64BitProcess) { diff --git a/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1 b/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1 index e12ee92..5e3eca3 100644 --- a/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1 +++ b/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1 @@ -16,7 +16,7 @@ param( [string] $Tag ) #Requires -RunAsAdministrator -New-Variable -Name gAksEdgeQuickStartForAioVersion -Value "1.0.231101.1400" -Option Constant -ErrorAction SilentlyContinue +New-Variable -Name gAksEdgeQuickStartForAioVersion -Value "1.0.250225.1400" -Option Constant -ErrorAction SilentlyContinue # Specify only AIO supported regions New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @( From 8a117404141ffc754a2eff0cf2bdfd9409647f18 Mon Sep 17 00:00:00 2001 From: msanjive-21 Date: Tue, 25 Feb 2025 14:07:05 -0800 Subject: [PATCH 2/4] Update psd file version --- tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1 index 7159298..b22140a 100644 --- 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.241002.1000' + ModuleVersion = '1.0.250225.1400' # Supported PSEditions # CompatiblePSEditions = @() From 589456ae527e39e277d6e2738d5785e1de2df362 Mon Sep 17 00:00:00 2001 From: msanjive-21 Date: Tue, 25 Feb 2025 14:16:26 -0800 Subject: [PATCH 3/4] Added location extraction logic as comment --- tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 index 7e1c89e..48890de 100644 --- a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 +++ b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 @@ -11,6 +11,12 @@ New-Variable -Option Constant -ErrorAction SilentlyContinue -Name azcmagentexe - New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arciotEnvConfig -Value @{ "ArcIotSchema" = @("SubscriptionName", "SubscriptionId", "TenantId", "ResourceGroupName", "Location", "Auth") } +<# Azure Regions where Arc enabled Kubernetes is supported. + $data = (az provider show --namespace "Microsoft.Kubernetes" --output json) | ConvertFrom-Json + $resourceInfo = $data.resourceTypes | Where-Object { $_.resourceType -eq "connectedclusters" } # lists the displaynames + $arcLocations = $resourceInfo.locations.toLower().replace(" ","") # gives the table below. + #Mapping of names to displaynames : az account list-locations -o table +#> New-Variable -option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @( "australiaeast","brazilsouth","canadacentral","canadaeast","centralindia","centralus","centraluseuap", "eastasia","eastus","eastus2","eastus2euap","francecentral","germanywestcentral","israelcentral", From 597b8d09f29a8540a95107fb86707e6275799b34 Mon Sep 17 00:00:00 2001 From: msanjive-21 Date: Tue, 25 Feb 2025 14:18:15 -0800 Subject: [PATCH 4/4] Updated comment --- tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 index 48890de..2ec3427 100644 --- a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 +++ b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AES.ps1 @@ -14,7 +14,8 @@ New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arciotEnvConfi <# Azure Regions where Arc enabled Kubernetes is supported. $data = (az provider show --namespace "Microsoft.Kubernetes" --output json) | ConvertFrom-Json $resourceInfo = $data.resourceTypes | Where-Object { $_.resourceType -eq "connectedclusters" } # lists the displaynames - $arcLocations = $resourceInfo.locations.toLower().replace(" ","") # gives the table below. + $arcLocations = $resourceInfo.locations.toLower().replace(" ","") # gives the locations unsorted. + $arcLocations = $arcLocations | Sort-Object # Sort the list. #Mapping of names to displaynames : az account list-locations -o table #> New-Variable -option Constant -ErrorAction SilentlyContinue -Name arcLocations -Value @(