Merge pull request #524 from microsoft/dev

jaromirk · web-flow · commit 494babb491ec · 2022-10-03T10:14:48.000+02:00
Dev
diff --git a/Scenarios/AzSHCI and AVD/Scenario.ps1 b/Scenarios/AzSHCI and AVD/Scenario.ps1
@@ -13,7 +13,7 @@
 
     $ManagedDiskName = "AVD_OS_Disk_Windows11_m365"
     $Offer="windows11preview"
-    $SKU="win11-21h2-avd-m365"
+    $SKU="win11-22h2-avd-m365"
 
     #Install Azure packages
         Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
@@ -1440,12 +1440,12 @@
         $OUPath="ou=workshop,dc=corp,dc=contoso,dc=com"
         $names=(Get-ChildItem -Path "$env:UserProfile\Downloads\WVDBackups" -Filter *.htm).BaseName
         foreach ($name in $names) {
-            New-GPO -Name $name  | New-GPLink -Target $OUPath
-            #Import-GPO -BackupGpoName $name -TargetName $name -path "$env:UserProfile\Downloads\WVDBackups"
+            #create GPO and import to OU (uncomment if needed)
+            New-GPO -Name $name #| New-GPLink -Target $OUPath
+            Import-GPO -BackupGpoName $name -TargetName $name -path "$env:UserProfile\Downloads\WVDBackups"
         }
 
-    #install FSLogix to session hosts (not needed, since in 21H2 agent is already present)
-    <#
+    #update FSLogix (if not needed, installer will gratefully shut down)
         #create sessions
         $Sessions=New-PSSession -ComputerName $VMs.VMName
         foreach ($session in $Sessions){
@@ -1459,8 +1459,7 @@
         }
 
     #reboot machines
-        Restart-Computer -ComputerName $VMs.VMName -Protocol WSMan -Wait -For PowerShell
-    #>
+        #Restart-Computer -ComputerName $VMs.VMName -Protocol WSMan -Wait -For PowerShell
 
     #Create users with password LS1setup!
         New-ADUser -Name JohnDoe -AccountPassword  (ConvertTo-SecureString "LS1setup!" -AsPlainText -Force) -Enabled $True -Path  "ou=workshop,dc=corp,dc=contoso,dc=com"
@@ -1565,7 +1564,7 @@
     Remove-AzResourceGroup -Name $AVDResourceGroupName -Force
 #remove Azure Service Principal
     $SP=Get-AzADServicePrincipal -DisplayName "Arc-for-servers"
-    Remove-AzADServicePrincipal -ObjectId $SP.Id -Force
+    Remove-AzADServicePrincipal -ObjectId $SP.Id
 #remove VMs
     foreach ($VM in $VMs){
         $VMObject=Get-VM -CimSession (Get-ClusterNode -Cluster $ClusterName).Name -Name $VM.VMName -ErrorAction Ignore
diff --git a/Scenarios/AzSHCI and Kubernetes/Scenario.ps1 b/Scenarios/AzSHCI and Kubernetes/Scenario.ps1
@@ -31,36 +31,40 @@ Foreach ($VM in $VMs){
 # LabConfig
 $Servers="AksHCI1","AksHCI2"
 $ClusterName="AksHCI-Cluster"
+$windowsupdate=$false
 
 # Install features for management on server
 Install-WindowsFeature -Name RSAT-DHCP,RSAT-Clustering,RSAT-Clustering-Mgmt,RSAT-Clustering-PowerShell,RSAT-Hyper-V-Tools
 
-# Update servers
-Invoke-Command -ComputerName $servers -ScriptBlock {
-    New-PSSessionConfigurationFile -RunAsVirtualAccount -Path $env:TEMP\VirtualAccount.pssc
-    Register-PSSessionConfiguration -Name 'VirtualAccount' -Path $env:TEMP\VirtualAccount.pssc -Force
-} -ErrorAction Ignore
-# Run Windows Update via ComObject.
-Invoke-Command -ComputerName $servers -ConfigurationName 'VirtualAccount' {
-    $Searcher = New-Object -ComObject Microsoft.Update.Searcher
-    $SearchCriteriaAllUpdates = "IsInstalled=0 and DeploymentAction='Installation' or
-                            IsPresent=1 and DeploymentAction='Uninstallation' or
-                            IsInstalled=1 and DeploymentAction='Installation' and RebootRequired=1 or
-                            IsInstalled=0 and DeploymentAction='Uninstallation' and RebootRequired=1"
-    $SearchResult = $Searcher.Search($SearchCriteriaAllUpdates).Updates
-    $Session = New-Object -ComObject Microsoft.Update.Session
-    $Downloader = $Session.CreateUpdateDownloader()
-    $Downloader.Updates = $SearchResult
-    $Downloader.Download()
-    $Installer = New-Object -ComObject Microsoft.Update.Installer
-    $Installer.Updates = $SearchResult
-    $Result = $Installer.Install()
-    $Result
-}
-#remove temporary PSsession config
-Invoke-Command -ComputerName $servers -ScriptBlock {
-    Unregister-PSSessionConfiguration -Name 'VirtualAccount'
-    Remove-Item -Path $env:TEMP\VirtualAccount.pssc
+#update servers if requested
+if ($windowsupdate){
+    # Update servers
+    Invoke-Command -ComputerName $servers -ScriptBlock {
+        New-PSSessionConfigurationFile -RunAsVirtualAccount -Path $env:TEMP\VirtualAccount.pssc
+        Register-PSSessionConfiguration -Name 'VirtualAccount' -Path $env:TEMP\VirtualAccount.pssc -Force
+    } -ErrorAction Ignore
+    # Run Windows Update via ComObject.
+    Invoke-Command -ComputerName $servers -ConfigurationName 'VirtualAccount' {
+        $Searcher = New-Object -ComObject Microsoft.Update.Searcher
+        $SearchCriteriaAllUpdates = "IsInstalled=0 and DeploymentAction='Installation' or
+                                IsPresent=1 and DeploymentAction='Uninstallation' or
+                                IsInstalled=1 and DeploymentAction='Installation' and RebootRequired=1 or
+                                IsInstalled=0 and DeploymentAction='Uninstallation' and RebootRequired=1"
+        $SearchResult = $Searcher.Search($SearchCriteriaAllUpdates).Updates
+        $Session = New-Object -ComObject Microsoft.Update.Session
+        $Downloader = $Session.CreateUpdateDownloader()
+        $Downloader.Updates = $SearchResult
+        $Downloader.Download()
+        $Installer = New-Object -ComObject Microsoft.Update.Installer
+        $Installer.Updates = $SearchResult
+        $Result = $Installer.Install()
+        $Result
+    }
+    #remove temporary PSsession config
+    Invoke-Command -ComputerName $servers -ScriptBlock {
+        Unregister-PSSessionConfiguration -Name 'VirtualAccount'
+        Remove-Item -Path $env:TEMP\VirtualAccount.pssc
+    }
 }
 
 # Update servers with all updates (including preview)
@@ -740,6 +744,31 @@ kubectl -n azure-arc get deployments,pods
 
 #endregion
 
+#region deploy Open Service Mesh extension https://docs.microsoft.com/en-us/azure/azure-arc/kubernetes/tutorial-arc-enabled-open-service-mesh
+    $ClusterName="AksHCI-Cluster"
+    $resourcegroup="$ClusterName-rg"
+    $KubernetesClusterName="demo"
+
+    $ExtensionName="openservicemesh-ext"
+
+    #register provider
+    $Provider="Microsoft.Kubernetes"
+    Register-AzResourceProvider -ProviderNamespace $Provider
+    #wait for provider to finish registration
+    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))
+
+    #deploy extension
+    az k8s-extension create --cluster-type connectedClusters --cluster-name $KubernetesClusterName --resource-group $resourcegroup --extension-type Microsoft.openservicemesh --name $ExtensionName
+
+    #validate deployment (show azurepolicy extension)
+    az k8s-extension show --name $ExtensionName --cluster-name $KubernetesClusterName --resource-group $resourcegroup --cluster-type connectedClusters | ConvertFrom-Json
+
+#endregion
+
 #region create Arc app service extension
 #https://docs.microsoft.com/en-us/azure/app-service/manage-create-arc-environment?tabs=powershell
 #looks like exstension fails https://github.com/Azure/azure-cli-extensions/issues/3661
@@ -916,6 +945,9 @@ $StorageContainerPath="c:\ClusterStorage\AKSContainer"
 $StorageContainerVolumeName=$StorageContainerPath | Split-Path -Leaf
 $StorageContainerSize=1TB
 
+#add kubectl to system environment variable, so it can be run by simply typing kubectl
+[System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+';c:\program files\AksHci')
+
     #Create volume for AKS if does not exist
     if (-not (Get-Volume -FriendlyName $StorageContainerVolumeName -CimSession $ClusterName -ErrorAction SilentlyContinue)) {
         New-Volume -FriendlyName $StorageContainerVolumeName -CimSession $ClusterName -Size $StorageContainerSize -StoragePoolFriendlyName S2D*
diff --git a/Scenarios/AzSHCI and Kubernetes/readme.md b/Scenarios/AzSHCI and Kubernetes/readme.md
@@ -21,16 +21,19 @@ https://aka.ms/AKSonHCI-Docs
 Note: please download latest [WSLab](https://aka.ms/wslab/download) as there is new VMProcessorCount value Max, that will configure maximum available LP to VMs.
 
 ```PowerShell
-$LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!' ; <#Prefix = 'WSLab-'#> ; DCEdition='4'; Internet=$true ; TelemetryLevel='Full' ; TelemetryNickname='' ; AdditionalNetworksConfig=@(); VMs=@()}
+$LabConfig=@{ManagementSubnetIDs=0..1 ; 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}}
+1..2 | ForEach-Object {$VMNames="AksHCI" ; $LABConfig.VMs += @{ VMName = "$VMNames$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI21H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 4TB ; MemoryStartupBytes= 24GB; VMProcessorCount="Max" ; NestedVirt=$true ; VirtualTPM=$true}}
 
-#Windows 10 management machine (for Windows Admin Center)
-$LabConfig.VMs += @{ VMName = 'Win10'; ParentVHD = 'Win1020H1_G2.vhdx' ; AddToolsVHD = $True ; MGMTNICs=1 }
+#or 2 nodes for Windows Server 2022
+#1..2 | ForEach-Object {$VMNames="AksHCI" ; $LABConfig.VMs += @{ VMName = "$VMNames$_" ; Configuration = 'S2D' ; ParentVHD = 'Win2022Core_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 4TB ; MemoryStartupBytes= 24GB; VMProcessorCount="Max" ; NestedVirt=$true ; VirtualTPM=$true}}
 
 #Windows Admin Center gateway
-#$LabConfig.VMs += @{ VMName = 'WACGW' ; ParentVHD = 'Win2019Core_G2.vhdx' ; MGMTNICs=1 }
+#$LabConfig.VMs += @{ VMName = 'WACGW' ; ParentVHD = 'Win2022Core_G2.vhdx' ; MGMTNICs=1 }
+
+#Management machine
+$LabConfig.VMs += @{ VMName = 'Management' ; ParentVHD = 'Win2022_G2.vhdx' ; MGMTNICs=1 }
  
 ```
 
diff --git a/Scripts/1_Prereq.ps1 b/Scripts/1_Prereq.ps1
@@ -308,6 +308,10 @@ if((Get-TelemetryLevel) -in $TelemetryEnabledLevels) {
 
 # finishing 
 WriteInfo "Script finished at $(Get-date) and took $(((get-date) - $StartDateTime).TotalMinutes) Minutes"
+
 Stop-Transcript
-WriteSuccess "Press enter to continue..."
-Read-Host | Out-Null
+
+If (!$LabConfig.AutoClosePSWindows) {
+    WriteSuccess "Press enter to continue..."
+    Read-Host | Out-Null
+}
diff --git a/Scripts/2_CreateParentDisks.ps1 b/Scripts/2_CreateParentDisks.ps1
@@ -1120,7 +1120,13 @@ If (-not $isAdmin) {
         <# 0 #> New-Object System.Management.Automation.Host.ChoiceDescription "&Yes", "Cleanup .\Temp\ 1_Prereq.ps1 2_CreateParentDisks.ps1 and rename 3_deploy.ps1 to just deploy.ps1"
         <# 1 #> New-Object System.Management.Automation.Host.ChoiceDescription "&No", "Keep files (in case DC was not created sucessfully)"
     )
-    $response = $host.UI.PromptForChoice("Unnecessary files cleanup","Do you want to cleanup unnecessary files and folders?", $options, 0 <#default option#>)
+    
+    If (!$LabConfig.AutoCleanUp) {
+        $response = $host.UI.PromptForChoice("Unnecessary files cleanup","Do you want to cleanup unnecessary files and folders?", $options, 0 <#default option#>)
+    }
+    else {
+        $response = 0
+    }
 
     If ($response -eq 1){
         $renamed = $false
@@ -1201,8 +1207,11 @@ If (-not $isAdmin) {
         Send-TelemetryEvents -Events $events | Out-Null
     }
 
-    Stop-Transcript
+Stop-Transcript
+
+If (!$LabConfig.AutoClosePSWindows) {
     WriteSuccess "Job Done. Press enter to continue..."
     Read-Host | Out-Null
+}
 
-#endregion
+#endregion
diff --git a/Scripts/3_Deploy.ps1 b/Scripts/3_Deploy.ps1
@@ -1808,11 +1808,13 @@ If (-not $isAdmin) {
         Send-TelemetryEvents -Events $vmDeploymentEvents | Out-Null
     }
 
-    #write how much it took to deploy
-        WriteInfo "Script finished at $CheckPointTime and took $(($CheckPointTime - $StartDateTime).TotalMinutes) Minutes"
+#write how much it took to deploy
+WriteInfo "Script finished at $CheckPointTime and took $(($CheckPointTime - $StartDateTime).TotalMinutes) Minutes"
 
-    Stop-Transcript
+Stop-Transcript
 
-    WriteSuccess "Press enter to continue ..."
+If (!$LabConfig.AutoClosePSWindows) {
+    WriteSuccess "Press enter to continue..."
     Read-Host | Out-Null
+}
 #endregion
diff --git a/Scripts/LabConfig.ps1 b/Scripts/LabConfig.ps1
@@ -46,6 +46,8 @@ $LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!'; Prefix = 'M
         Linux=$false;                                # (Optional) If set to $true, required prerequisities for building Linux images with Packer will be configured.
         LinuxAdminName="linuxadmin";                 # (Optional) If set, local user account with that name will be created in Linux image. If not, DomainAdminName will be used as a local account.
         SshKeyPath="$($env:USERPROFILE)\.ssh\id_rsa" # (Optional) If set, specified SSH key will be used to build and access Linux images.
+        AutoClosePSWindows=$false;                   # (Optional) If set, the PowerShell console windows will automatically close once the script has completed successfully. Best suited for use in automated deployments.
+        AutoCleanUp=$false;                          # (Optional) If set, after creating initial parent disks, files that are no longer necessary will be cleaned up. Best suited for use in automated deployments.
         AdditionalNetworksConfig=@();                # Just empty array for config below
         VMs=@();                                     # Just empty array for config below
     }
@@ -206,6 +208,15 @@ $LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!'; Prefix = 'M
     SshKeyPath (optional)
         Example: SshKeyPath="$($env:USERPROFILE)\.ssh\id_rsa"
         If configured, existing SSH key will be used for building and connecting to Linux images. If not, 0_Prereq.ps1 will generate a new SSH key pair and store it locally in LAB folder.
+
+    AutoStartAfterDeploy (optional)
+        Example: AutoClosePSWindows=$true
+        If set to true, the PowerShell console windows will automatically close once the script has completed successfully. Best suited for use in automated deployments.
+
+    AutoCleanup (optional)
+        Example: AutoCleanUp=$true
+        If set to true, after creating initial parent disks, files that are no longer necessary will be cleaned up. Best suited for use in automated deployments.
+
     #>
 #endregion
 
diff --git a/Tools/CreateParentDisk.ps1 b/Tools/CreateParentDisk.ps1
@@ -161,6 +161,9 @@ If (-not $isAdmin) {
                     20348 {
                         "AzSHCI21H2_G2.vhdx"
                     }
+                    22621 {
+                        "AzSHCI22H2_G2.vhdx"
+                    }
                 }
                 if ($BuildNumber -GT 20348){
                     $tempvhdname="AzSHCIInsider_$BuildNumber.vhdx"
@@ -296,8 +299,11 @@ If (-not $isAdmin) {
                     22000 {
                         "Win1121H2_G2.vhdx"
                     }
+                    22621 {
+                        "Win1122H2_G2.vhdx"
+                    }
                 }
-                if ($BuildNumber -GT 22000){
+                if ($BuildNumber -GT 22621){
                     $tempvhdname="Win11Insider_$BuildNumber.vhdx"
                 }
             }
diff --git a/Tools/DownloadLatestCUs.ps1 b/Tools/DownloadLatestCUs.ps1
@@ -43,10 +43,11 @@ $Products+=@{Product="Azure Stack HCI 21H2 and Windows Server 2022" ;SearchStrin
 $Products+=@{Product="Azure Stack HCI 20H2"                         ;SearchString="Cumulative Update for Azure Stack HCI, version 20H2"                                        ;SSUSearchString="Servicing Stack Update for Azure Stack HCI, version 20H2 for x64-based Systems"                  ; ID="Azure Stack HCI"}
 $Products+=@{Product="Windows Server 2019"                          ;SearchString="Cumulative Update for Windows Server 2019 for x64-based Systems"                            ;SSUSearchString="Servicing Stack Update for Windows Server 2019 for x64-based Systems"                            ; ID="Windows Server 2019"}
 $Products+=@{Product="Windows Server 2016"                          ;SearchString="Cumulative Update for Windows Server 2016 for x64-based Systems"                            ;SSUSearchString="Servicing Stack Update for Windows Server 2016 for x64-based Systems"                            ; ID="Windows Server 2016"}
-$Products+=@{Product="Windows 10 21H1"                              ;SearchString="Cumulative Update for Windows 10 Version 21H1 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 21H1 for x64-based Systems"                        ; ID="Windows 10, version 1903 and later"}
-$Products+=@{Product="Windows 10 20H2"                              ;SearchString="Cumulative Update for Windows 10 Version 20H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 20H2 for x64-based Systems"                        ; ID="Windows 10, version 1903 and later"}
-$Products+=@{Product="Windows 10 2004"                              ;SearchString="Cumulative Update for Windows 10 Version 2004 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 2004 for x64-based Systems"                        ; ID="Windows 10, version 1903 and later"}
-$Products+=@{Product="Windows 10 1909"                              ;SearchString="Cumulative Update for Windows 10 Version 1909 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 1909 for x64-based Systems"                        ; ID="Windows 10, version 1903 and later"}
+$Products+=@{Product="Windows 11 22H2"                              ;SearchString="Cumulative Update for Windows 11 Version 22H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 11 Version 22H2 for x64-based Systems"                        ; ID="Windows 11"}
+$Products+=@{Product="Windows 10 21H2"                              ;SearchString="Cumulative Update for Windows 10 Version 21H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 21H2 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later, Windows 10 LTSB"}
+$Products+=@{Product="Windows 10 20H2"                              ;SearchString="Cumulative Update for Windows 10 Version 20H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 20H2 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}
+$Products+=@{Product="Windows 10 2004"                              ;SearchString="Cumulative Update for Windows 10 Version 2004 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 2004 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}
+$Products+=@{Product="Windows 10 1909"                              ;SearchString="Cumulative Update for Windows 10 Version 1909 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 1909 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}
 
 #grab folder to download to
 $folder=Read-Host -Prompt "Please type path to download. For example `"c:\temp`" (if nothing specified, $PSScriptRoot is used)"

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,9 @@ If (-not $isAdmin) {`
`161`	`161`	`20348 {`
`162`	`162`	`"AzSHCI21H2_G2.vhdx"`
`163`	`163`	`}`
	`164`	`+ 22621 {`
	`165`	`+ "AzSHCI22H2_G2.vhdx"`
	`166`	`+ }`
`164`	`167`	`}`
`165`	`168`	`if ($BuildNumber -GT 20348){`
`166`	`169`	`$tempvhdname="AzSHCIInsider_$BuildNumber.vhdx"`
`@@ -296,8 +299,11 @@ If (-not $isAdmin) {`
`296`	`299`	`22000 {`
`297`	`300`	`"Win1121H2_G2.vhdx"`
`298`	`301`	`}`
	`302`	`+ 22621 {`
	`303`	`+ "Win1122H2_G2.vhdx"`
	`304`	`+ }`
`299`	`305`	`}`
`300`		`- if ($BuildNumber -GT 22000){`
	`306`	`+ if ($BuildNumber -GT 22621){`
`301`	`307`	`$tempvhdname="Win11Insider_$BuildNumber.vhdx"`
`302`	`308`	`}`
`303`	`309`	`}`