Merge pull request #2747 from janegilring/hcibox_vnext

HCIBox - added WinGet, PowerShell 7, VM autologon and Pester tests
microsoft · Oct 7, 2024 · 8e3e1c7 · 8e3e1c7
2 parents 9e04666 + ba784c2
commit 8e3e1c7
Show file tree

Hide file tree

Showing 18 changed files with 479 additions and 191 deletions.
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/main.bicep b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/main.bicep
@@ -43,9 +43,9 @@ param subnetNameCloud string = 'AKS-EE-Full-Subnet'
 param kubernetesDistribution string
 
 @description('''The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.
-To pin a specific version, use the format '1.13'. To use the latest schema version, use 'useLatest'.
+To pin a specific version, use the format '1.14'. To use the latest schema version, use 'useLatest'.
 ''')
-param AKSEEPinnedSchemaVersion string = '1.13'
+param AKSEEPinnedSchemaVersion string = '1.14'
 
 var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/'
 

diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/main.bicep b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/main.bicep
@@ -43,9 +43,9 @@ param subnetNameCloud string = 'AKS-EE-Full-Subnet'
 param kubernetesDistribution string
 
 @description('''The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.
-To pin a specific version, use the format '1.13'. To use the latest schema version, use 'useLatest'.
+To pin a specific version, use the format '1.14'. To use the latest schema version, use 'useLatest'.
 ''')
-param AKSEEPinnedSchemaVersion string = '1.13'
+param AKSEEPinnedSchemaVersion string = '1.14'
 
 var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/'
 

diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.json b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.json
@@ -142,9 +142,9 @@
         },
         "AKSEEPinnedSchemaVersion": {
             "type": "string",
-            "defaultValue": "1.13",
+            "defaultValue": "1.14",
             "metadata": {
-                "description": "The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.To pin a specific version, use the format '1.13'. To use the latest schema version, use 'useLatest'"
+                "description": "The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.To pin a specific version, use the format '1.14'. To use the latest schema version, use 'useLatest'"
             }
         }
     },

diff --git a/...rc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.json b/...rc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.json
@@ -142,9 +142,9 @@
         },
         "AKSEEPinnedSchemaVersion": {
             "type": "string",
-            "defaultValue": "1.13",
+            "defaultValue": "1.14",
             "metadata": {
-                "description": "The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.To pin a specific version, use the format '1.13'. To use the latest schema version, use 'useLatest'"
+                "description": "The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.To pin a specific version, use the format '1.14'. To use the latest schema version, use 'useLatest'"
             }
         }
     },

diff --git a/azure_jumpstart_ag/manufacturing/bicep/main.bicep b/azure_jumpstart_ag/manufacturing/bicep/main.bicep
@@ -93,9 +93,9 @@ param rdpPort string = '3389'
 param industry string = 'manufacturing'
 
 @description('''The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.
-To pin a specific version, use the format '1.13'. To use the latest schema version, use 'useLatest'.
+To pin a specific version, use the format '1.14'. To use the latest schema version, use 'useLatest'.
 ''')
-param AKSEEPinnedSchemaVersion string = '1.13'
+param AKSEEPinnedSchemaVersion string = '1.14'
 
 var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_jumpstart_ag/'
 

diff --git a/azure_jumpstart_ag/retail/bicep/main.bicep b/azure_jumpstart_ag/retail/bicep/main.bicep
@@ -84,9 +84,9 @@ param rdpPort string = '3389'
 param industry string = 'retail'
 
 @description('''The AKS Edge Essentials schema version to be used. This is only used to pin the AKS Edge Essentials schema version for testing.
-To pin a specific version, use the format '1.13'. To use the latest schema version, use 'useLatest'.
+To pin a specific version, use the format '1.14'. To use the latest schema version, use 'useLatest'.
 ''')
-param AKSEEPinnedSchemaVersion string = '1.13'
+param AKSEEPinnedSchemaVersion string = '1.14'
 
 var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_jumpstart_ag/'
 

diff --git a/azure_jumpstart_arcbox/artifacts/WinGet.ps1 b/azure_jumpstart_arcbox/artifacts/WinGet.ps1
@@ -7,8 +7,9 @@ $logFilePath = Join-Path -Path $Env:ArcBoxLogsDir -ChildPath ('WinGet-provisioni
 
 Start-Transcript -Path $logFilePath -Force -ErrorAction SilentlyContinue
 
-# Install WinGet DSC resource - also installs Microsoft.WinGet.Client as implicit dependency
-Install-PSResource -Name Microsoft.WinGet.DSC -Scope AllUsers -Quiet -AcceptLicense -TrustRepository -Prerelease
+# Install WinGet PowerShell modules
+Install-PSResource -Name Microsoft.WinGet.Client -Scope AllUsers -Quiet -AcceptLicense -TrustRepository -Version 1.8.1911
+Install-PSResource -Name Microsoft.WinGet.DSC -Scope AllUsers -Quiet -AcceptLicense -TrustRepository -Prerelease -Version 1.8.1911-alpha
 
 # Install DSC resources required for ArcBox
 Install-PSResource -Name DSCR_Font -Scope AllUsers -Quiet -AcceptLicense -TrustRepository