From 1c81071d39d411be2adbcdcf7642a374a141f5d3 Mon Sep 17 00:00:00 2001 From: Jeremy Edwards <1312331+jeremyje@users.noreply.github.com> Date: Tue, 9 Feb 2021 10:14:22 +0000 Subject: [PATCH] Add references to Windows 20H2 test images. Signed-off-by: Jeremy Edwards <1312331+jeremyje@users.noreply.github.com> --- client_windows_test.go | 6 ++++-- pkg/cri/config/config_windows.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client_windows_test.go b/client_windows_test.go index ea94c8014..1cd50e5ea 100644 --- a/client_windows_test.go +++ b/client_windows_test.go @@ -50,10 +50,12 @@ func init() { testImage = "mcr.microsoft.com/windows/nanoserver:1809" case osversion.V19H1: testImage = "mcr.microsoft.com/windows/nanoserver:1903" - case 18363: // this isn't in osversion yet, but the image should be available + case osversion.V19H2: testImage = "mcr.microsoft.com/windows/nanoserver:1909" - case 19041: // this isn't in osversion yet, but the image should be available + case osversion.V20H1: testImage = "mcr.microsoft.com/windows/nanoserver:2004" + case osversion.V20H2: + testImage = "mcr.microsoft.com/windows/nanoserver:20H2" default: fmt.Println("No test image defined for Windows build version:", b) panic("No windows test image found for this Windows build") diff --git a/pkg/cri/config/config_windows.go b/pkg/cri/config/config_windows.go index 44efd281f..40766bed3 100644 --- a/pkg/cri/config/config_windows.go +++ b/pkg/cri/config/config_windows.go @@ -54,7 +54,7 @@ func DefaultConfig() PluginConfig { TLSKeyFile: "", TLSCertFile: "", }, - SandboxImage: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0", + SandboxImage: "mcr.microsoft.com/oss/kubernetes/pause:1.4.1", StatsCollectPeriod: 10, MaxContainerLogLineSize: 16 * 1024, Registry: Registry{