From b0ed29e62414554b40048a8d34f8cd5a0e749dda Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 13 Feb 2025 03:49:52 +0000 Subject: [PATCH] revert, add comment --- parts/common/components.json | 3 ++- schemas/components.cue | 1 + vhdbuilder/packer/windows/components_json_helpers.tests.ps1 | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/parts/common/components.json b/parts/common/components.json index dc353720ef8..b387ac67b76 100644 --- a/parts/common/components.json +++ b/parts/common/components.json @@ -28,8 +28,9 @@ "multiArchVersionsV2": [], "windowsVersions": [ { + "comment": "1809 gets patches every 6 months or so. The alternative is ltsc2019 which gets patches every couple of years. Most customers use 1809, so we keep that on the VHD", "renovateTag": "registry=https://mcr.microsoft.com, name=windows/nanoserver", - "latestVersion": "ltsc2019", + "latestVersion": "1809", "windowsSkuMatch": "2019-containerd" }, { diff --git a/schemas/components.cue b/schemas/components.cue index c065da49d47..5844d349d21 100644 --- a/schemas/components.cue +++ b/schemas/components.cue @@ -23,6 +23,7 @@ package components } #WindowsVersion: { + comment?: string k8sVersion?: string renovateTag?: string latestVersion: string diff --git a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 index 71168eaa475..a8c83573c1b 100644 --- a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 +++ b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 @@ -645,9 +645,9 @@ Describe 'Tests of components.json ' { $components.Length | Should -BeGreaterThan 0 - # Pause image shouldn't change too often, so let's check that is in there. + # core images shouldn't change too often, so let's check that is in there. $components | Should -Contain "mcr.microsoft.com/windows/servercore:ltsc2019" - $components | Should -Contain "mcr.microsoft.com/windows/nanoserver:ltsc2019" + $components | Should -Contain "mcr.microsoft.com/windows/nanoserver:1809" } It 'has specific WS2022 containers' {