github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5025 from jeremyje/win20h2

Browse Source 
Add references to Windows 20H2 test images.
This commit is contained in:
Michael Crosby 2021-02-12 11:58:49 -05:00 committed by GitHub
commit 41e3057cc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client_windows_test.go
View File

@ -50,10 +50,12 @@ func init() {
testImage = "mcr.microsoft.com/windows/nanoserver:1809" testImage = "mcr.microsoft.com/windows/nanoserver:1809"
case osversion.V19H1: case osversion.V19H1:
testImage = "mcr.microsoft.com/windows/nanoserver:1903" 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" 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" testImage = "mcr.microsoft.com/windows/nanoserver:2004"
case osversion.V20H2:
testImage = "mcr.microsoft.com/windows/nanoserver:20H2"
default: default:
fmt.Println("No test image defined for Windows build version:", b) fmt.Println("No test image defined for Windows build version:", b)
panic("No windows test image found for this Windows build") panic("No windows test image found for this Windows build")

2
pkg/cri/config/config_windows.go
View File

@ -54,7 +54,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0", SandboxImage: "mcr.microsoft.com/oss/kubernetes/pause:1.4.1",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,
Registry: Registry{ Registry: Registry{