Skip to content

Commit

Permalink
feat: update Windows base images to 2024.05B (#4400)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShiqianTao
ShiqianTao committed May 16, 2024
1 parent e805aeb commit 2e27a6b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 18 deletions.
19 changes: 6 additions & 13 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ $global:defenderUpdateInfoUrl = "https://go.microsoft.com/fwlink/?linkid=870379&
switch -Regex ($windowsSku) {
"2019-containerd" {
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/04/windows10.0-kb5036896-x64_57eaad3d6f3738831f3f8c6bdf7a77df618429c2.msu")
$global:patchIDs = @("KB5036896")
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/05/windows10.0-kb5037765-x64_3ca0b737e301d4e398a38f1d67966f1c82507fa8.msu")
$global:patchIDs = @("KB5037765")
$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/secu/2024/04/windows10.0-kb5036909-x64_786040b0b0d000b17d6a727ea93ff77d733d1044.msu")
$global:patchIDs = @("KB5036909")
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/secu/2024/05/windows10.0-kb5037782-x64_a28aa2576fc6b120b127acfbb901d3546ba9db82.msu")
$global:patchIDs = @("KB5037782")
$global:imagesToPull = @(
"mcr.microsoft.com/windows/servercore:ltsc2022",
Expand Down Expand Up @@ -85,9 +85,7 @@ $global:imagesToPull += @(
"mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0", # for k8s 1.25.x, 1.26.x, 1.27.x
"mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.9.0", # for k8s 1.28.x
"mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.10.0", # for k8s 1.29.x
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.6-windows-hp", # for k8s 1.27.x
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.7-windows-hp", # for k8s 1.27.x
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.3-windows-hp", # for k8s 1.28.x
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.4-windows-hp", # for k8s 1.28.x
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.30.1-windows-hp", # for k8s 1.29.x
"mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.9-windows-hp", # for k8s 1.27.x
Expand All @@ -97,27 +95,22 @@ $global:imagesToPull += @(
"mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.1-windows-hp", # for k8s 1.29.x
"mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.2-windows-hp", # for k8s 1.29.x
# Addon of Azure secrets store. Owner: jiashun0011 (Jiashun Liu)
"mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.3.4",
"mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.2",
"mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.3",
"mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.1",
"mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.5.1",
"mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.5.2",
# Azure cloud node manager. Owner: nilo19 (Qi Ni), lzhecheng (Zhecheng Li)
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.25.24", # for k8s 1.25.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.26.22", # for k8s 1.26.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.27.16", # for k8s 1.27.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.27.17", # for k8s 1.27.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.28.8", # for k8s 1.28.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.28.9", # for k8s 1.28.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.29.3", # for k8s 1.29.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.29.4", # for k8s 1.29.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.29.5", # for k8s 1.29.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.30.0", # for k8s 1.30.x
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.30.1", # for k8s 1.30.x
# OMS-Agent (Azure monitor). Owner: ganga1980 (Ganga Mahesh Siddem)
"mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.20",
# CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn)
"mcr.microsoft.com/containernetworking/azure-cns:v1.4.52",
"mcr.microsoft.com/containernetworking/azure-cns:v1.5.23",
"mcr.microsoft.com/containernetworking/azure-cns:v1.5.26",
# Dropgz (init container to CNS). Owner: pjohnst5 (Paul Johnston)
"mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.3"
Expand Down
10 changes: 5 additions & 5 deletions vhdbuilder/packer/windows-image.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5696.240406
WINDOWS_2019_BASE_IMAGE_VERSION=17763.5820.240510

# 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.2402.240405
WINDOWS_2022_BASE_IMAGE_VERSION=20348.2461.240510

# 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.2402.240405
WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2461.240510

# 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.830.240406
WINDOWS_23H2_BASE_IMAGE_VERSION=25398.887.240505

# 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.830.240406
WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.887.240505

# 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
Expand Down

0 comments on commit 2e27a6b

Please sign in to comment.