From f7cc97269ec5de7ada60fdc6bfff3b9f817a999f Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 13 Feb 2025 23:08:45 +0000 Subject: [PATCH 1/3] update ciprod to 3.1.25, exclude it from windows 23H2 SKU --- parts/common/components.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/parts/common/components.json b/parts/common/components.json index d401ac32c81..d11f91e1f41 100644 --- a/parts/common/components.json +++ b/parts/common/components.json @@ -385,6 +385,18 @@ "renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod", "latestVersion": "3.1.24" } + ], + "windowsVersions": [ + { + "renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod", + "latestVersion": "3.1.25", + "windowsSkuMatch": "2022*" + }, + { + "renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod", + "latestVersion": "3.1.25", + "windowsSkuMatch": "2019*" + } ] }, { From 98dc92635dd8beae78b12ae2fcd6015eb1eedfcc Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 13 Feb 2025 23:10:47 +0000 Subject: [PATCH 2/3] add comment --- parts/common/components.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parts/common/components.json b/parts/common/components.json index d11f91e1f41..f9aa47eb7c7 100644 --- a/parts/common/components.json +++ b/parts/common/components.json @@ -383,16 +383,18 @@ "multiArchVersionsV2": [ { "renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod", - "latestVersion": "3.1.24" + "latestVersion": "3.1.25" } ], "windowsVersions": [ { + "comment": "ciprod isn't supported on Win23H2 so is excluded as it makes the VHD too large", "renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod", "latestVersion": "3.1.25", "windowsSkuMatch": "2022*" }, { + "comment": "ciprod isn't supported on Win23H2 so is excluded as it makes the VHD too large", "renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod", "latestVersion": "3.1.25", "windowsSkuMatch": "2019*" From 9e8718a50f48b7eec1669018c326e260bb36faf4 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 14 Feb 2025 00:11:10 +0000 Subject: [PATCH 3/3] Add tests --- .../windows/components_json_helpers.tests.ps1 | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 index a8c83573c1b..895aefe7abd 100644 --- a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 +++ b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 @@ -581,10 +581,27 @@ Describe 'Tests of components.json ' { $components | Should -Contain "mcr.microsoft.com/oss/kubernetes/pause:3.9" } - it 'has the right version of ciprod' { + it 'has the right version of ciprod for win 2019' { + $windowsSku = "2019-containerd" + $components = GetComponentsFromComponentsJson $componentsJson + + $components | Should -Contain "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25" + } + + + it 'has the right version of ciprod for win 2022' { + $windowsSku = "2022-containerd" $components = GetComponentsFromComponentsJson $componentsJson - $components | Should -Contain "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.24" + $components | Should -Contain "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25" + } + + + it 'has the no version of ciprod for win 23H2' { + $windowsSku = "23H2" + $components = GetComponentsFromComponentsJson $componentsJson + + $components | Should -Not -Contain "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25" } It 'has the latest 2 versions of windows scripts and cgmaplugin' { @@ -617,6 +634,7 @@ Describe 'Tests of components.json ' { $packages["c:\akse-cache\win-vnet-cni\"] | Should -Contain "https://acs-mirror.azureedge.net/azure-cni/v1.6.18/binaries/azure-vnet-cni-windows-amd64-v1.6.18.zip" $packages["c:\akse-cache\win-vnet-cni\"] | Should -Contain "https://acs-mirror.azureedge.net/azure-cni/v1.4.58/binaries/azure-vnet-cni-swift-windows-amd64-v1.4.58.zip" $packages["c:\akse-cache\win-vnet-cni\"] | Should -Contain "https://acs-mirror.azureedge.net/azure-cni/v1.4.59/binaries/azure-vnet-cni-swift-windows-amd64-v1.4.59.zip" + $packages["c:\akse-cache\win-vnet-cni\"] | Should -Contain "https://acs-mirror.azureedge.net/azure-cni/v1.4.58/binaries/azure-vnet-cni-overlay-windows-amd64-v1.4.58.zip" $packages["c:\akse-cache\win-vnet-cni\"] | Should -Contain "https://acs-mirror.azureedge.net/azure-cni/v1.4.59/binaries/azure-vnet-cni-overlay-windows-amd64-v1.4.59.zip" }