From 34a8a252093b96c9403d30ce78206eca5393ea9f Mon Sep 17 00:00:00 2001
From: Paramesh Babu <parameshbabu@users.noreply.github.com>
Date: Tue, 14 Mar 2023 08:12:04 -0700
Subject: [PATCH] Az ConnectedKubernetes 0.9.0 intake (#91)

* Az ConnectedKubernetes 0.9.0
* remove azure-arc-release patch - 0.9.0 version fix
---
 tools/aksedge-config.json                         |  2 +-
 tools/modules/AksEdgeDeploy/AksEdgeDeploy-AEC.ps1 | 15 ++++-----------
 tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1    |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/tools/aksedge-config.json b/tools/aksedge-config.json
index ac6c893..601b255 100644
--- a/tools/aksedge-config.json
+++ b/tools/aksedge-config.json
@@ -3,7 +3,7 @@
     "Version": "1.0",
     "DeploymentType": "SingleMachineCluster",
     "Init": {
-        "ServiceIPRangeSize": 0
+        "ServiceIPRangeSize": 10
     },
     "Arc": {
         "ClusterName": null,
diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AEC.ps1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AEC.ps1
index e9d7b49..ce5de66 100644
--- a/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AEC.ps1
+++ b/tools/modules/AksEdgeDeploy/AksEdgeDeploy-AEC.ps1
@@ -259,7 +259,7 @@ New-Variable -Option Constant -ErrorAction SilentlyContinue -Name arcEdgeInstall
     "PSModules" = @(
         @{Name="Az.Resources"; Version="6.4.1"; Flags="-AllowClobber"},
         @{Name="Az.Accounts"; Version="2.11.2"; Flags="-AllowClobber"}, 
-        @{Name="Az.ConnectedKubernetes"; Version="0.8.0"; Flags="-AllowClobber"}
+        @{Name="Az.ConnectedKubernetes"; Version="0.9.0"; Flags="-AllowClobber"}
         )
     "Urls" = @{
         helm = "https://k8connecthelm.azureedge.net/helm/helm-v3.6.3-windows-amd64.zip"
@@ -287,7 +287,7 @@ function Test-ArcEdgeAzModules {
     $pkgproviders = Get-PackageProvider
     if ($pkgproviders.Name -notcontains "NuGet"){
         Write-Host "Installing NuGet"
-        Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
+        Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force -Confirm:$false
     } else { Write-Host "NuGet found" -ForegroundColor Green }
 
     Write-Host "Checking Helm"
@@ -295,7 +295,7 @@ function Test-ArcEdgeAzModules {
     $helmDir = "$helmRoot\windows-amd64"
     if (!(($env:Path).Contains($helmDir))) {
         $env:Path = "$helmDir;$env:Path"
-	[Environment]::SetEnvironmentVariable('Path', $env:Path)
+	    [Environment]::SetEnvironmentVariable('Path', $env:Path,"Machine")
     }
     $cmd = Get-Command helm -ErrorAction SilentlyContinue
     if ($null -eq $cmd)
@@ -375,7 +375,7 @@ function Connect-AideArcKubernetes {
             #Arc for server is already connected. So try updating tags
             $serverid = "/subscriptions/$($serverinfo.SubscriptionId)/resourceGroups/$($serverinfo.ResourceGroupName)/providers/Microsoft.HybridCompute/machines/$($serverinfo.Name)"
             $clustername = Get-AideArcClusterName
-            $tag = @{ AKSEE="$clustername" }
+            $tag = @{ "AKSEE"="$clustername" }
             $result = Update-AzTag -ResourceId $serverid -Tag $tag -Operation Merge
             Write-Verbose $result
         }
@@ -386,12 +386,5 @@ function Disconnect-AideArcKubernetes {
     $usrCfg = Get-AideUserConfig
     $json = ($usrCfg.AksEdgeConfig | ConvertTo-Json )
     $retVal = Disconnect-AksEdgeArc -JsonConfigString $json
-    if ($retVal -eq "OK") {
-        #patch to remove azure-arc-release namespace
-        $namespaces = (kubectl get namespaces -o custom-columns=NAME:.metadata.name --no-headers)
-        if ($namespaces.Contains("azure-arc-release")) {
-            kubectl delete namespace azure-arc-release
-        }
-    }
     return ($retVal -eq "OK")
 }
\ No newline at end of file
diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psd1
index f4f9004..968a217 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.230227.1200'
+    ModuleVersion     = '1.0.230313.1200'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()