feat: update Windows base images to 2024.07B

Azure · Jul 10, 2024 · ef3535f · ef3535f
1 parent 0d60c2f
commit ef3535f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/vhdbuilder/packer/configure-windows-vhd.ps1 b/vhdbuilder/packer/configure-windows-vhd.ps1
@@ -676,6 +676,9 @@ function Update-Registry {
         Enable-WindowsFixInFeatureManagement -Name 2540111500
         Enable-WindowsFixInFeatureManagement -Name 50261647
         Enable-WindowsFixInFeatureManagement -Name 1475968140
+
+        Write-Log "Enable 1 fix in 2024-07B"
+        Enable-WindowsFixInFeatureManagement -Name 747051149
     }
 
     if ($env:WindowsSKU -Like '23H2*') {

diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -15,7 +15,7 @@ $global:aksTempDir = "c:\akstemp"
 $global:aksToolsDir = "c:\aks-tools"
 
 # We need to guarantee that the node provisioning will not fail because the vhd is full before resize-osdisk is called in AKS Windows CSE script.
-$global:lowestFreeSpace = 1.5*1024*1024*1024 # 1.5GB
+$global:lowestFreeSpace = 1*1024*1024*1024 # 1GB
 
 $global:excludeHashComparisionListInAzureChinaCloud = @(
     "calico-windows",
@@ -51,17 +51,17 @@ $global:defenderUpdateInfoUrl = "https://go.microsoft.com/fwlink/?linkid=870379&
 
 switch -Regex ($windowsSku) {
     "2019-containerd" {
-        $global:patchUrls = @("https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/secu/2024/06/windows10.0-kb5039217-x64_bc72f4ed75c6dd7bf033b823f79533d5772769a3.msu")
-        $global:patchIDs = @("KB5039217")
+        $global:patchUrls = @("https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/07/windows10.0-kb5040430-x64_9879d14c817a7aec56b0ae1f73daecc7a678b3aa.msu")
+        $global:patchIDs = @("KB5040430")
 
         $global:imagesToPull = @(
             "mcr.microsoft.com/windows/servercore:ltsc2019",
             "mcr.microsoft.com/windows/nanoserver:1809"
         )
     }
     "2022-containerd*" {
-        $global:patchUrls = @("https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/updt/2024/06/windows10.0-kb5041054-x64_0a6d6b4af8a6f87cf01cab2e42fb07e326974f3b.msu")
-        $global:patchIDs = @("KB5041054")
+        $global:patchUrls = @("https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/07/windows10.0-kb5040437-x64_c1c5b6fc0825f932db8a90481dd087b07053de91.msu")
+        $global:patchIDs = @("KB5040437")
 
         $global:imagesToPull = @(
             "mcr.microsoft.com/windows/servercore:ltsc2022",
@@ -72,6 +72,7 @@ switch -Regex ($windowsSku) {
         )
     }
     "23H2*" {
+        # Don't need to update patchUrls and patchIDs for 23H2 since it's by design.
         $global:patchUrls = @()
         $global:patchIDs = @()
 

diff --git a/vhdbuilder/packer/test/windows-vhd-content-test.ps1 b/vhdbuilder/packer/test/windows-vhd-content-test.ps1
@@ -392,6 +392,8 @@ function Test-RegistryAdded {
         Validate-WindowsFixInFeatureManagement -Name 2540111500
         Validate-WindowsFixInFeatureManagement -Name 50261647
         Validate-WindowsFixInFeatureManagement -Name 1475968140
+
+        Validate-WindowsFixInFeatureManagement -Name 747051149
     }
     if ($env:WindowsSKU -Like '23H2*') {
         Validate-WindowsFixInHnsState -Name NamespaceExcludedUdpPorts -Value 65330

diff --git a/vhdbuilder/packer/windows-image.env b/vhdbuilder/packer/windows-image.env
@@ -4,31 +4,31 @@
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:2019-Datacenter-Core-smalldisk:latest
 WINDOWS_2019_BASE_IMAGE_SKU=2019-Datacenter-Core-smalldisk
-WINDOWS_2019_BASE_IMAGE_VERSION=17763.5936.240607
+WINDOWS_2019_BASE_IMAGE_VERSION=17763.6054.240703
 
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:2022-Datacenter-Core-smalldisk:latest
 WINDOWS_2022_BASE_IMAGE_SKU=2022-Datacenter-Core-smalldisk
-WINDOWS_2022_BASE_IMAGE_VERSION=20348.2529.240619
+WINDOWS_2022_BASE_IMAGE_VERSION=20348.2582.240703
 
 # CLI example to get all available image version under a SKU (suffix g2 for Gen 2):
 #   az vm image list --all --publisher MicrosoftWindowsServer --offer WindowsServer --output table -s 2022-datacenter-core-smalldisk-g2
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:2022-datacenter-core-smalldisk-g2:latest
 WINDOWS_2022_GEN2_BASE_IMAGE_SKU=2022-datacenter-core-smalldisk-g2
-WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2529.240619
+WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2582.240703
 
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:23h2-datacenter-core:latest
 WINDOWS_23H2_BASE_IMAGE_SKU=23h2-datacenter-core
-WINDOWS_23H2_BASE_IMAGE_VERSION=25398.950.240607
+WINDOWS_23H2_BASE_IMAGE_VERSION=25398.1009.240702
 
 # CLI example to get all available image version under a SKU (suffix g2 for Gen 2):
 #   az vm image list --all --publisher MicrosoftWindowsServer --offer WindowsServer --output table -s 23h2-datacenter-core-g2
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:23h2-datacenter-core-g2:latest
 WINDOWS_23H2_GEN2_BASE_IMAGE_SKU=23h2-datacenter-core-g2
-WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.950.240607
+WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.1009.240702
 
 # Please uncomment the following lines and set a larger os disk size that is at least 30GB when your PR check-in fails
 # WINDOWS_2019_CONTAINERD_OS_DISK_SIZE_GB=30

diff --git a/vhdbuilder/packer/write-release-notes-windows.ps1 b/vhdbuilder/packer/write-release-notes-windows.ps1
@@ -149,7 +149,8 @@ $wuRegistryNames = @(
     "1605443213",
     "2540111500",
     "50261647",
-    "1475968140"
+    "1475968140",
+    "747051149"
 )
 
 foreach ($key in $wuRegistryKeys) {