From 2601e23bc2532cdad06bc890137e2a25c5e03a3e Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Thu, 19 Aug 2021 11:16:27 +0000 Subject: [PATCH] test images: Adds Windows Server 2022 to the BASEIMAGEs (part 2) The Container Images for Windows Server 2022 have been published, and we can start building test images using them, so we can start adding jobs for them. The image versions for the e2e test images have been bumped in a previous commit, but haven't been promoted yet. We don't need to bump them here. httpd-2.4.46-win64-VC15.zip no longer exists, so we have to use httpd-2.4.48-win64-VC15.zip instead. --- test/images/README.md | 2 +- test/images/agnhost/BASEIMAGE | 7 ++++--- test/images/agnhost/README.md | 5 +++-- test/images/echoserver/BASEIMAGE | 7 ++++--- test/images/httpd-new/BASEIMAGE | 7 ++++--- test/images/httpd-new/Dockerfile_windows | 2 +- test/images/httpd/BASEIMAGE | 7 ++++--- test/images/jessie-dnsutils/BASEIMAGE | 7 ++++--- test/images/kitten/BASEIMAGE | 17 +++++++++-------- test/images/nautilus/BASEIMAGE | 17 +++++++++-------- test/images/nginx-new/BASEIMAGE | 7 ++++--- test/images/nginx/BASEIMAGE | 7 ++++--- test/images/nonroot/BASEIMAGE | 1 + test/images/redis/BASEIMAGE | 7 ++++--- test/images/resource-consumer/BASEIMAGE | 1 + test/images/sample-apiserver/BASEIMAGE | 1 + test/images/windows-nanoserver/BASEIMAGE | 1 + 17 files changed, 59 insertions(+), 44 deletions(-) diff --git a/test/images/README.md b/test/images/README.md index 0a0e894b16e..7b571e3d715 100644 --- a/test/images/README.md +++ b/test/images/README.md @@ -95,7 +95,7 @@ It can be used by anyone, but if you need to build your own, you can read more a For Windows, in order to spawn process-isolated containers, the container OS version should closely match the host OS version. For this reason, we build test images for different Windows OS Versions: 1809 (Windows Server 2019), -2004, 20H2. In order add support for a new Windows OS version, a new entry for that OS version will have +2004, 20H2, ltsc2022. In order add support for a new Windows OS version, a new entry for that OS version will have to be first added to the `windows-servercore-cache` and `busybox` images, followed by the rest of the images. These images are then used by the rest of the E2E test images as a cache / base image. diff --git a/test/images/agnhost/BASEIMAGE b/test/images/agnhost/BASEIMAGE index 6802c01d84a..8620733faab 100644 --- a/test/images/agnhost/BASEIMAGE +++ b/test/images/agnhost/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/alpine:3.12 linux/arm64=arm64v8/alpine:3.12 linux/ppc64le=ppc64le/alpine:3.12 linux/s390x=s390x/alpine:3.12 -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md index a38072a4484..ee70887f063 100644 --- a/test/images/agnhost/README.md +++ b/test/images/agnhost/README.md @@ -643,6 +643,7 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i ## Image -The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.32` for both Linux and +The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.33` for both Linux and Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, -`mcr.microsoft.com/windows/nanoserver:2004`, and `mcr.microsoft.com/windows/nanoserver:20H2`). +`mcr.microsoft.com/windows/nanoserver:2004`, `mcr.microsoft.com/windows/nanoserver:20H2`, and +`mcr.microsoft.com/windows/nanoserver:ltsc2022`). diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE index 4ea5d1a5e70..4fecf09e855 100644 --- a/test/images/echoserver/BASEIMAGE +++ b/test/images/echoserver/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/nginx:1.15-alpine linux/arm64=arm64v8/nginx:1.15-alpine linux/ppc64le=ppc64le/nginx:1.15-alpine linux/s390x=s390x/nginx:1.15-alpine -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/httpd-new/BASEIMAGE b/test/images/httpd-new/BASEIMAGE index 9e57c1ad5c4..0d24a22d5ad 100644 --- a/test/images/httpd-new/BASEIMAGE +++ b/test/images/httpd-new/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/httpd:2.4.39-alpine linux/arm64=arm64v8/httpd:2.4.39-alpine linux/ppc64le=ppc64le/httpd:2.4.39-alpine linux/s390x=s390x/httpd:2.4.39-alpine -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/httpd-new/Dockerfile_windows b/test/images/httpd-new/Dockerfile_windows index 57d35bf8673..430f9fcd307 100644 --- a/test/images/httpd-new/Dockerfile_windows +++ b/test/images/httpd-new/Dockerfile_windows @@ -18,7 +18,7 @@ ARG REGISTRY # We're using a Linux image to unpack the archive, then we're copying it over to Windows. FROM --platform=linux/amd64 alpine:3.6 as prep -ADD https://home.apache.org/~steffenal/VC15/binaries/httpd-2.4.46-win64-VC15.zip /httpd.zip +ADD https://home.apache.org/~steffenal/VC15/binaries/httpd-2.4.48-win64-VC15.zip /httpd.zip ADD https://windows.php.net/downloads/releases/archives/php-7.4.14-Win32-vc15-x64.zip /php.zip ADD https://windows.php.net/downloads/nano/crt/crt-vc15-x64.zip /crt-vc15-x64.zip diff --git a/test/images/httpd/BASEIMAGE b/test/images/httpd/BASEIMAGE index e45e17c4669..d804834c552 100644 --- a/test/images/httpd/BASEIMAGE +++ b/test/images/httpd/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/httpd:2.4.38-alpine linux/arm64=arm64v8/httpd:2.4.38-alpine linux/ppc64le=ppc64le/httpd:2.4.38-alpine linux/s390x=s390x/httpd:2.4.38-alpine -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE index d602eb55ba8..bb3907c713d 100644 --- a/test/images/jessie-dnsutils/BASEIMAGE +++ b/test/images/jessie-dnsutils/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v7/debian:jessie linux/arm64=arm64v8/debian:jessie linux/ppc64le=ppc64le/debian:jessie linux/s390x=s390x/debian:jessie -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE index 50f3d32782d..ce028534e48 100644 --- a/test/images/kitten/BASEIMAGE +++ b/test/images/kitten/BASEIMAGE @@ -1,8 +1,9 @@ -linux/amd64=REGISTRY/agnhost:2.26-linux-amd64 -linux/arm=REGISTRY/agnhost:2.26-linux-arm -linux/arm64=REGISTRY/agnhost:2.26-linux-arm64 -linux/ppc64le=REGISTRY/agnhost:2.26-linux-ppc64le -linux/s390x=REGISTRY/agnhost:2.26-linux-s390x -windows/amd64/1809=REGISTRY/agnhost:2.26-windows-amd64-1809 -windows/amd64/2004=REGISTRY/agnhost:2.26-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/agnhost:2.26-windows-amd64-20H2 +linux/amd64=REGISTRY/agnhost:2.33-linux-amd64 +linux/arm=REGISTRY/agnhost:2.33-linux-arm +linux/arm64=REGISTRY/agnhost:2.33-linux-arm64 +linux/ppc64le=REGISTRY/agnhost:2.33-linux-ppc64le +linux/s390x=REGISTRY/agnhost:2.33-linux-s390x +windows/amd64/1809=REGISTRY/agnhost:2.33-windows-amd64-1809 +windows/amd64/2004=REGISTRY/agnhost:2.33-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/agnhost:2.33-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/agnhost:2.33-windows-amd64-ltsc2022 diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE index 50f3d32782d..ce028534e48 100644 --- a/test/images/nautilus/BASEIMAGE +++ b/test/images/nautilus/BASEIMAGE @@ -1,8 +1,9 @@ -linux/amd64=REGISTRY/agnhost:2.26-linux-amd64 -linux/arm=REGISTRY/agnhost:2.26-linux-arm -linux/arm64=REGISTRY/agnhost:2.26-linux-arm64 -linux/ppc64le=REGISTRY/agnhost:2.26-linux-ppc64le -linux/s390x=REGISTRY/agnhost:2.26-linux-s390x -windows/amd64/1809=REGISTRY/agnhost:2.26-windows-amd64-1809 -windows/amd64/2004=REGISTRY/agnhost:2.26-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/agnhost:2.26-windows-amd64-20H2 +linux/amd64=REGISTRY/agnhost:2.33-linux-amd64 +linux/arm=REGISTRY/agnhost:2.33-linux-arm +linux/arm64=REGISTRY/agnhost:2.33-linux-arm64 +linux/ppc64le=REGISTRY/agnhost:2.33-linux-ppc64le +linux/s390x=REGISTRY/agnhost:2.33-linux-s390x +windows/amd64/1809=REGISTRY/agnhost:2.33-windows-amd64-1809 +windows/amd64/2004=REGISTRY/agnhost:2.33-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/agnhost:2.33-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/agnhost:2.33-windows-amd64-ltsc2022 diff --git a/test/images/nginx-new/BASEIMAGE b/test/images/nginx-new/BASEIMAGE index 4ea5d1a5e70..4fecf09e855 100644 --- a/test/images/nginx-new/BASEIMAGE +++ b/test/images/nginx-new/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/nginx:1.15-alpine linux/arm64=arm64v8/nginx:1.15-alpine linux/ppc64le=ppc64le/nginx:1.15-alpine linux/s390x=s390x/nginx:1.15-alpine -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/nginx/BASEIMAGE b/test/images/nginx/BASEIMAGE index fc384782f4e..046b164e285 100644 --- a/test/images/nginx/BASEIMAGE +++ b/test/images/nginx/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/nginx:1.14-alpine linux/arm64=arm64v8/nginx:1.14-alpine linux/ppc64le=ppc64le/nginx:1.14-alpine linux/s390x=s390x/nginx:1.14-alpine -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index 979be7e16cc..811f9537950 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 +windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE index b098b83ad11..08a90525ea3 100644 --- a/test/images/redis/BASEIMAGE +++ b/test/images/redis/BASEIMAGE @@ -3,6 +3,7 @@ linux/arm=arm32v6/alpine:3.6 linux/arm64=arm64v8/alpine:3.6 linux/ppc64le=ppc64le/alpine:3.6 linux/s390x=s390x/alpine:3.6 -windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 -windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 +windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 +windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 +windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 9c46faf7a93..2f16eb2be8d 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=k8s.gcr.io/debian-base-s390x:0.4.1 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 +windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE index 00cdcae6326..088e746e625 100644 --- a/test/images/sample-apiserver/BASEIMAGE +++ b/test/images/sample-apiserver/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.8 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 +windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/windows-nanoserver/BASEIMAGE b/test/images/windows-nanoserver/BASEIMAGE index db9b595de1b..c917035428e 100644 --- a/test/images/windows-nanoserver/BASEIMAGE +++ b/test/images/windows-nanoserver/BASEIMAGE @@ -1,3 +1,4 @@ windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 +windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022