From 5e8d69839c254ba3981f7cb58ecd17e9ffab1d5c Mon Sep 17 00:00:00 2001
From: Jaromir Kaspar <jaromirk@microsoft.com>
Date: Tue, 4 May 2021 19:05:58 +0200
Subject: [PATCH 1/3] AksHci RC bump

---
 Scenarios/AzSHCI and Kubernetes/LabConfig.ps1 |  2 +-
 Scenarios/AzSHCI and Kubernetes/Scenario.ps1  | 73 +++++++++++++++----
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/Scenarios/AzSHCI and Kubernetes/LabConfig.ps1 b/Scenarios/AzSHCI and Kubernetes/LabConfig.ps1
index 408bb92c..426443ca 100644
--- a/Scenarios/AzSHCI and Kubernetes/LabConfig.ps1	
+++ b/Scenarios/AzSHCI and Kubernetes/LabConfig.ps1	
@@ -1,4 +1,4 @@
-$LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!' ; <#Prefix = 'WSLab-'#> ; DCEdition='4'; Internet=$true ; TelemetryLevel='Full' ; TelemetryNickname='' ; AdditionalNetworksConfig=@(); VMs=@()}
+$LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!' ; Prefix = 'MSLab-' ; DCEdition='4'; Internet=$true ; TelemetryLevel='Full' ; TelemetryNickname='' ; AdditionalNetworksConfig=@(); VMs=@()}
 
 #2 nodes for AzSHCI Cluster
 1..2 | ForEach-Object {$VMNames="AzSHCI" ; $LABConfig.VMs += @{ VMName = "$VMNames$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI20H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 4TB ; MemoryStartupBytes= 24GB; VMProcessorCount="Max" ; NestedVirt=$true}}
diff --git a/Scenarios/AzSHCI and Kubernetes/Scenario.ps1 b/Scenarios/AzSHCI and Kubernetes/Scenario.ps1
index 6cfb8d72..502ac610 100644
--- a/Scenarios/AzSHCI and Kubernetes/Scenario.ps1	
+++ b/Scenarios/AzSHCI and Kubernetes/Scenario.ps1	
@@ -3,7 +3,8 @@
 #############################
 
 #run from Host to expand C: drives in VMs to 120GB. This is required as Install-AKSHCI checks free space on C (should check free space in CSV)
-$VMs=Get-VM -VMName WSLab*azshci*
+#script grabs all VMs starting with "MSLab" (and containing azshci), so modify line below accordingly
+$VMs=Get-VM -VMName MSLab*azshci*
 $VMs | Get-VMHardDiskDrive -ControllerLocation 0 | Resize-VHD -SizeBytes 120GB
 #VM Credentials
 $secpasswd = ConvertTo-SecureString "LS1setup!" -AsPlainText -Force
@@ -195,9 +196,9 @@ Invoke-Command -ComputerName $ClusterName -ScriptBlock {
 #endregion
 
 #region Download AKS HCI module
-Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -Destination "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Mar-2021.zip"
+Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -Destination "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip"
 #unzip
-Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Mar-2021.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
+Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
 Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -DestinationPath "$env:USERPROFILE\Downloads\AksHci.Powershell" -Force
 
 #endregion
@@ -206,12 +207,15 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
     #Copy PowerShell module to nodes
     $ClusterName="AzSHCI-Cluster"
     $vSwitchName="vSwitch"
+    $vNetName="aksvnet"
     $VolumeName="AKS"
     $Servers=(Get-ClusterNode -Cluster $ClusterName).Name
     $VIPPoolStart="10.0.0.100"
     $VIPPoolEnd="10.0.0.200"
+    $resourcegroupname="$ClusterName-rg"
 
     #Copy module to nodes
+    #JaromirK note: it would be nice to skip this step and keep management tools only on management machine - in this case DC
     $PSSessions=New-PSSession -ComputerName $Servers
     foreach ($PSSession in $PSSessions){
         $Folders=Get-ChildItem -Path $env:USERPROFILE\Downloads\AksHci.Powershell\ 
@@ -220,10 +224,14 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
         }
     }
 
-    #why this does not work? Why I need to login ot server to run initialize AKSHCINode???
-    <#Invoke-Command -ComputerName $servers -ScriptBlock {
-        Initialize-AksHciNode
-    }#>
+    #copy module locally
+    $Folders=Get-ChildItem -Path $env:USERPROFILE\Downloads\AksHci.Powershell\ 
+    foreach ($Folder in $Folders){
+        Copy-Item -Path $folder.FullName -Destination $env:ProgramFiles\windowspowershell\modules -Recurse -Force
+    }
+
+
+    #JaromirK note: it would be great if I could simply run "Initialize-AksHciNode -ComputerName $ClusterName". I could simply skip credssp. Same applies for AksHciConfig and AksHciRegistration
 
     #Enable CredSSP
     # Temporarily enable CredSSP delegation to avoid double-hop issue
@@ -235,6 +243,21 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
     $password = ConvertTo-SecureString "LS1setup!" -AsPlainText -Force
     $Credentials = New-Object System.Management.Automation.PSCredential ("CORP\LabAdmin", $password)
 
+    #add required modules (parsing required modules from kva.psd - it also requires certain version of modules)
+    #JaromirK note: it would be great if this dependency was downloaded automagically or if you would be ok with latest version (or some minimumversion)
+    $item=Get-ChildItem -Path "C:\Program Files\WindowsPowerShell\Modules\Kva" -Recurse | Where-Object name -eq kva.psd1
+    $RequiredModules=(Import-LocalizedData -BaseDirectory $item.Directory -FileName $item.Name).RequiredModules
+
+    Invoke-Command -ComputerName $Servers {
+        Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
+        Install-Module -Name PowershellGet -Force -Confirm:$false -SkipPublisherCheck
+        foreach ($RequiredModule in $using:RequiredModules){
+            if (!(Get-InstalledModule -Name $RequiredModule.ModuleName -RequiredVersion $RequiredModule.RequiredVersion -ErrorAction Ignore)){
+                Install-Module -Name $RequiredModule.ModuleName -RequiredVersion $RequiredModule.RequiredVersion -Force
+            }
+        }
+    }
+
     Invoke-Command -ComputerName $servers -Credential $Credentials -Authentication Credssp -ScriptBlock {
         Initialize-AksHciNode
     }
@@ -247,9 +270,9 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
     }
     #configure aks
     Invoke-Command -ComputerName $servers[0] -Credential $Credentials -Authentication Credssp -ScriptBlock {
-        $vnet = New-AksHciNetworkSetting -vnetName $using:vSwitchName -vippoolstart $using:vippoolstart -vippoolend $using:vippoolend
-        #Set-AksHciConfig -vnet $vnet -workingDir c:\clusterstorage\$using:VolumeName\Images -imageDir c:\clusterstorage\$using:VolumeName\Images -cloudConfigLocation c:\clusterstorage\$using:VolumeName\Config -ClusterRoleName "$($using:ClusterName)_AKS" -enableDiagnosticData -controlPlaneVmSize 'default' # Get-AksHciVmSize
-        Set-AksHciConfig -vnet $vnet -imageDir c:\clusterstorage\$using:VolumeName\Images -cloudConfigLocation c:\clusterstorage\$using:VolumeName\Config -ClusterRoleName "$($using:ClusterName)_AKS" -enableDiagnosticData -controlPlaneVmSize 'default' # Get-AksHciVmSize
+        $vnet = New-AksHciNetworkSetting -Name $using:vNetName -vSwitchName $using:vSwitchName -vippoolstart $using:vippoolstart -vippoolend $using:vippoolend
+        #Set-AksHciConfig -vnet $vnet -workingDir c:\clusterstorage\$using:VolumeName\Images -imageDir c:\clusterstorage\$using:VolumeName\Images -cloudConfigLocation c:\clusterstorage\$using:VolumeName\Config -ClusterRoleName "$($using:ClusterName)_AKS" -controlPlaneVmSize 'default' # Get-AksHciVmSize
+        Set-AksHciConfig -vnet $vnet -imageDir c:\clusterstorage\$using:VolumeName\Images -cloudConfigLocation c:\clusterstorage\$using:VolumeName\Config -ClusterRoleName "$($using:ClusterName)_AKS" -controlPlaneVmSize 'default' # Get-AksHciVmSize
     }
 
     #validate config
@@ -257,6 +280,26 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
         Get-AksHciConfig
     }
 
+    #register in Azure
+    if (-not (Get-AzContext)){
+        Connect-AzAccount -UseDeviceAuthentication
+    }
+    #grab subscription ID
+    $subscriptionID=(Get-AzContext).Subscription.id
+
+    #Register AZSHCi without prompting for creds
+    $armTokenItemResource = "https://management.core.windows.net/"
+    $graphTokenItemResource = "https://graph.windows.net/"
+    $azContext = Get-AzContext
+    $authFactory = [Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance.AuthenticationFactory
+    $graphToken = $authFactory.Authenticate($azContext.Account, $azContext.Environment, $azContext.Tenant.Id, $null, [Microsoft.Azure.Commands.Common.Authentication.ShowDialog]::Never, $null, $graphTokenItemResource).AccessToken
+    $armToken = $authFactory.Authenticate($azContext.Account, $azContext.Environment, $azContext.Tenant.Id, $null, [Microsoft.Azure.Commands.Common.Authentication.ShowDialog]::Never, $null, $armTokenItemResource).AccessToken
+    $id = $azContext.Account.Id
+
+    Invoke-Command -computername $servers[0] -ScriptBlock {
+        Set-AksHciRegistration -SubscriptionID $using:subscriptionID -GraphAccessToken $using:graphToken -ArmAccessToken $using:armToken -AccountId $using:id -ResourceGroupName $using:resourcegroupname
+    }
+
     #Install
     Invoke-Command -ComputerName $servers[0] -Credential $Credentials -Authentication Credssp -ScriptBlock {
         Install-AksHci
@@ -268,6 +311,7 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
 #endregion
 
 #region create AKS HCI cluster
+#Jaromirk note: it would be great if I could specify HCI Cluster (like New-AksHciCluster -ComputerName)
 $ClusterName="AzSHCI-Cluster"
 $ClusterNode=(Get-ClusterNode -Cluster $clustername).Name | Select-Object -First 1
 Invoke-Command -ComputerName $ClusterNode -ScriptBlock {
@@ -275,6 +319,7 @@ Invoke-Command -ComputerName $ClusterNode -ScriptBlock {
 }
 
 #distribute kubeconfig to other nodes (just to make it symmetric)
+#Jaromirk note: I think this would be useful to do with new-akshcicluster
 $ClusterNodes=(Get-ClusterNode -Cluster $clustername).Name
 $FirstSession=New-PSSession -ComputerName ($ClusterNodes | Select-Object -First 1)
 $OtherSessions=New-PSSession -ComputerName ($ClusterNodes | Select-Object -Skip 1)
@@ -553,9 +598,9 @@ Get-AzADApplication -DisplayNameStartWith $ClusterName | Remove-AzADApplication
 
     #add feed
     #download nupgk (included in aks-hci module)
-    Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -OutFile "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Oct-2020.zip"
+    Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -Destination "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip"
     #unzip
-    Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Oct-2020.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
+    Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
     Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -DestinationPath "$env:USERPROFILE\Downloads\AksHci.Powershell" -Force
     $Filename=Get-ChildItem -Path $env:userprofile\downloads\ | Where-Object Name -like "msft.sme.aks.*.nupkg"
     New-Item -Path "C:\WACFeeds\" -Name Feeds -ItemType Directory -Force
@@ -620,9 +665,9 @@ foreach ($computer in $computers){
 }
 
 #Download AKS HCI module
-Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -Destination "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Oct-2020.zip"
+Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -Destination "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip"
 #unzip
-Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Oct-2020.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
+Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
 Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
 
 #copy nupkg to WAC

From 44d7ab42fd2da622871afdacfac3ef7cb664ea5a Mon Sep 17 00:00:00 2001
From: Jaromir Kaspar <jaromirk@microsoft.com>
Date: Thu, 27 May 2021 03:25:05 +0200
Subject: [PATCH 2/3] AKS GA

---
 Scenarios/AzSHCI and Kubernetes/Scenario.ps1 | 121 ++++++++++++-------
 1 file changed, 77 insertions(+), 44 deletions(-)

diff --git a/Scenarios/AzSHCI and Kubernetes/Scenario.ps1 b/Scenarios/AzSHCI and Kubernetes/Scenario.ps1
index 502ac610..da1a9125 100644
--- a/Scenarios/AzSHCI and Kubernetes/Scenario.ps1	
+++ b/Scenarios/AzSHCI and Kubernetes/Scenario.ps1	
@@ -1,3 +1,6 @@
+<# 
+Not needed anymore. Keeping it if someone wants to recycle
+
 #############################
 ### Run from Hyper-V Host ###
 #############################
@@ -16,6 +19,8 @@ Foreach ($VM in $VMs){
         $part | Resize-Partition -Size $sizemax
     }
 }
+#>
+
 
 ###################
 ### Run from DC ###
@@ -109,7 +114,7 @@ Clear-DNSClientCache
 Enable-ClusterS2D -CimSession $ClusterName -Verbose -Confirm:0
 #endregion
 
-#region Register Azure Stack HCI to Azure
+#region Register Azure Stack HCI to Azure - if not registered, VMs are not added as cluster resources = AKS script will fail
 $ClusterName="AzSHCI-Cluster"
 
 #download Azure module
@@ -142,10 +147,10 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMa
 reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\EscDomains\msftauth.net\aadcdn" /v https /t REG_DWORD /d 2
 Connect-AzAccount
 #>
-#select context if more available
-$context=Get-AzContext -ListAvailable
-if (($context).count -gt 1){
-    $context | Out-GridView -OutputMode Single | Set-AzContext
+#select subscription if more available
+$subscription=Get-AzSubscription
+if (($subscription).count -gt 1){
+    $subscription | Out-GridView -OutputMode Single | Set-AzContext
 }
 
 #grab subscription ID
@@ -195,16 +200,44 @@ Invoke-Command -ComputerName $ClusterName -ScriptBlock {
 }
 #endregion
 
-#region Download AKS HCI module
-Start-BitsTransfer -Source "https://aka.ms/aks-hci-download" -Destination "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip"
-#unzip
-Expand-Archive -Path "$env:USERPROFILE\Downloads\AKS-HCI-Public-Preview-Apr-2021.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
-Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -DestinationPath "$env:USERPROFILE\Downloads\AksHci.Powershell" -Force
+#region Install required modules for AKSHCI https://docs.microsoft.com/en-us/azure-stack/aks-hci/kubernetes-walkthrough-powershell
+Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
+Install-Module -Name PowershellGet -Force -Confirm:$false -SkipPublisherCheck
+Update-Module -Name PowerShellGet
+#Install-Module -Name Az.Accounts -Repository PSGallery -RequiredVersion 2.2.4 -Force
+#Install-Module -Name Az.Resources -Repository PSGallery -RequiredVersion 3.2.0 -Force
+#Install-Module -Name AzureAD -Repository PSGallery -RequiredVersion 2.0.2.128 -Force
+#to be able to install AKSHCI, powershellget 2.2.5 needs to be used - to this posh restart is needed
+Start-Process -FilePath PowerShell -ArgumentList {
+    Install-Module -Name AksHci -Repository PSGallery -Force -AcceptLicense
+}
+#add required modules (parsing required modules from kva.psd - it also requires certain version of modules)
+#JaromirK note: it would be great if this dependency was downloaded automagically or if you would be ok with latest version (or some minimumversion)
+$item=Get-ChildItem -Path "C:\Program Files\WindowsPowerShell\Modules\Kva" -Recurse | Where-Object name -eq kva.psd1
+$RequiredModules=(Import-LocalizedData -BaseDirectory $item.Directory -FileName $item.Name).RequiredModules
+foreach ($RequiredModule in $RequiredModules){
+    if (!(Get-InstalledModule -Name $RequiredModule.ModuleName -RequiredVersion $RequiredModule.RequiredVersion -ErrorAction Ignore)){
+        Install-Module -Name $RequiredModule.ModuleName -RequiredVersion $RequiredModule.RequiredVersion -Force
+    }
+}
 
+#distribute modules to cluster nodes
+$ClusterName="AzSHCI-Cluster"
+$Servers=(Get-ClusterNode -Cluster $Clustername).Name
+$ModuleNames="AksHci","Moc","Kva"
+$PSSessions=New-PSSession -ComputerName $Servers
+Foreach ($PSSession in $PSSessions){
+    Foreach ($ModuleName in $ModuleNames){
+        Copy-Item -Path $env:ProgramFiles\windowspowershell\modules\$ModuleName -Destination $env:ProgramFiles\windowspowershell\modules -ToSession $PSSession -Recurse -Force
+    }
+    Foreach ($ModuleName in $RequiredModules.ModuleName){
+        Copy-Item -Path $env:ProgramFiles\windowspowershell\modules\$ModuleName -Destination $env:ProgramFiles\windowspowershell\modules -ToSession $PSSession -Recurse -Force
+    }
+}
 #endregion
 
 #region setup AKS (PowerShell)
-    #Copy PowerShell module to nodes
+    #set variables
     $ClusterName="AzSHCI-Cluster"
     $vSwitchName="vSwitch"
     $vNetName="aksvnet"
@@ -214,23 +247,6 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
     $VIPPoolEnd="10.0.0.200"
     $resourcegroupname="$ClusterName-rg"
 
-    #Copy module to nodes
-    #JaromirK note: it would be nice to skip this step and keep management tools only on management machine - in this case DC
-    $PSSessions=New-PSSession -ComputerName $Servers
-    foreach ($PSSession in $PSSessions){
-        $Folders=Get-ChildItem -Path $env:USERPROFILE\Downloads\AksHci.Powershell\ 
-        foreach ($Folder in $Folders){
-            Copy-Item -Path $folder.FullName -Destination $env:ProgramFiles\windowspowershell\modules -ToSession $PSSession -Recurse -Force
-        }
-    }
-
-    #copy module locally
-    $Folders=Get-ChildItem -Path $env:USERPROFILE\Downloads\AksHci.Powershell\ 
-    foreach ($Folder in $Folders){
-        Copy-Item -Path $folder.FullName -Destination $env:ProgramFiles\windowspowershell\modules -Recurse -Force
-    }
-
-
     #JaromirK note: it would be great if I could simply run "Initialize-AksHciNode -ComputerName $ClusterName". I could simply skip credssp. Same applies for AksHciConfig and AksHciRegistration
 
     #Enable CredSSP
@@ -243,21 +259,6 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
     $password = ConvertTo-SecureString "LS1setup!" -AsPlainText -Force
     $Credentials = New-Object System.Management.Automation.PSCredential ("CORP\LabAdmin", $password)
 
-    #add required modules (parsing required modules from kva.psd - it also requires certain version of modules)
-    #JaromirK note: it would be great if this dependency was downloaded automagically or if you would be ok with latest version (or some minimumversion)
-    $item=Get-ChildItem -Path "C:\Program Files\WindowsPowerShell\Modules\Kva" -Recurse | Where-Object name -eq kva.psd1
-    $RequiredModules=(Import-LocalizedData -BaseDirectory $item.Directory -FileName $item.Name).RequiredModules
-
-    Invoke-Command -ComputerName $Servers {
-        Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
-        Install-Module -Name PowershellGet -Force -Confirm:$false -SkipPublisherCheck
-        foreach ($RequiredModule in $using:RequiredModules){
-            if (!(Get-InstalledModule -Name $RequiredModule.ModuleName -RequiredVersion $RequiredModule.RequiredVersion -ErrorAction Ignore)){
-                Install-Module -Name $RequiredModule.ModuleName -RequiredVersion $RequiredModule.RequiredVersion -Force
-            }
-        }
-    }
-
     Invoke-Command -ComputerName $servers -Credential $Credentials -Authentication Credssp -ScriptBlock {
         Initialize-AksHciNode
     }
@@ -284,9 +285,29 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
     if (-not (Get-AzContext)){
         Connect-AzAccount -UseDeviceAuthentication
     }
-    #grab subscription ID
+    $subscription=Get-AzSubscription
+    if (($subscription).count -gt 1){
+        $subscription | Out-GridView -OutputMode Single | Set-AzContext
+    }
     $subscriptionID=(Get-AzContext).Subscription.id
 
+    #make sure Kubernetes resource providers are registered
+    if (!(Get-InstalledModule -Name Az.Resources -ErrorAction Ignore)){
+        Install-Module -Name Az.Resources -Force
+    }
+    Register-AzResourceProvider -ProviderNamespace Microsoft.Kubernetes
+    Register-AzResourceProvider -ProviderNamespace Microsoft.KubernetesConfiguration
+
+    #wait until resource providers are registered
+    $Providers="Microsoft.Kubernetes","Microsoft.KubernetesConfiguration"
+    foreach ($Provider in $Providers){
+        do {
+            $Status=Get-AzResourceProvider -ProviderNamespace $Provider
+            Write-Output "Registration Status - $Provider : $(($status.RegistrationState -match 'Registered').Count)/$($Status.Count)"
+            Start-Sleep 1
+        } while (($status.RegistrationState -match "Registered").Count -ne ($Status.Count))
+    }
+
     #Register AZSHCi without prompting for creds
     $armTokenItemResource = "https://management.core.windows.net/"
     $graphTokenItemResource = "https://graph.windows.net/"
@@ -300,6 +321,13 @@ Expand-Archive -Path "$env:USERPROFILE\Downloads\AksHci.Powershell.zip" -Destina
         Set-AksHciRegistration -SubscriptionID $using:subscriptionID -GraphAccessToken $using:graphToken -ArmAccessToken $using:armToken -AccountId $using:id -ResourceGroupName $using:resourcegroupname
     }
 
+    #or with Device Authentication
+    <#
+    Invoke-Command -computername $servers[0] -ScriptBlock {
+        Set-AksHciRegistration -SubscriptionID $using:subscriptionID -ResourceGroupName $using:resourcegroupname -UseDeviceAuthentication
+    }
+    #>
+
     #Install
     Invoke-Command -ComputerName $servers[0] -Credential $Credentials -Authentication Credssp -ScriptBlock {
         Install-AksHci
@@ -356,6 +384,11 @@ Standard_K8S3_v1 4   6
 #>
 #endregion
 
+############################################################################
+# Tested until here - GA AKS
+############################################################################
+
+
 #region onboard AKS cluster to Azure ARC
 $ClusterName="AzSHCI-Cluster"
 

From cd33b09629f0eb6ddf73abea8e754bd4d84e5c33 Mon Sep 17 00:00:00 2001
From: Jaromir Kaspar <jaromirk@microsoft.com>
Date: Thu, 27 May 2021 20:45:26 +0200
Subject: [PATCH 3/3] Windows Server 2022

---
 Scripts/2_CreateParentDisks.ps1 | 14 ++++++++++++++
 Tools/CreateParentDisk.ps1      | 11 ++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Scripts/2_CreateParentDisks.ps1 b/Scripts/2_CreateParentDisks.ps1
index f032cc16..6b58871f 100644
--- a/Scripts/2_CreateParentDisks.ps1
+++ b/Scripts/2_CreateParentDisks.ps1
@@ -384,6 +384,20 @@ If (-not $isAdmin) {
             VHDName="Win2019Core_G2.vhdx"
             Size=30GB
         }
+    }elseif ($BuildNumber -eq 20348){
+        #Windows Server 2022
+        $ServerVHDs += @{
+            Kind = "Full"
+            Edition="4" 
+            VHDName="Win2022_G2.vhdx"
+            Size=60GB
+        }
+        $ServerVHDs += @{
+            Kind = "Core"
+            Edition="3" 
+            VHDName="Win2022Core_G2.vhdx"
+            Size=30GB
+        }
     }elseif ($BuildNumber -ge 17744 -and $SAC){
         $ServerVHDs += @{
             Kind = "Core"
diff --git a/Tools/CreateParentDisk.ps1 b/Tools/CreateParentDisk.ps1
index f5c4bd2a..0dcf4fe7 100644
--- a/Tools/CreateParentDisk.ps1
+++ b/Tools/CreateParentDisk.ps1
@@ -194,8 +194,11 @@ If (-not $isAdmin) {
                     19041 {
                         "WinServer20H1_G2.vhdx"
                     }
+                    20348 {
+                        "Win2022Core_G2.vhdx"
+                    }
                 }
-                if ($BuildNumber -gt 18362){
+                if ($BuildNumber -gt 20348){
                     $tempvhdname="WinSrvInsiderCore_$BuildNumber.vhdx"
                 }
             }elseif($Edition -like "Hyper-V*"){
@@ -233,8 +236,11 @@ If (-not $isAdmin) {
                     17763 {
                         "Win2019_G2.vhdx"
                     }
+                    20348 {
+                        "Win2022_G2.vhdx"
+                    }
                 }
-                if ($BuildNumber -GT 18362){
+                if ($BuildNumber -GT 20348){
                     $tempvhdname="WinSrvInsider_$BuildNumber.vhdx"
                 }
             }else{
@@ -253,7 +259,6 @@ If (-not $isAdmin) {
                     }
                     10240 {
                         "Win10TH1_G2.vhdx"
-
                     }
                     10586 {
                         "Win10TH2_G2.vhdx"