github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104455 from claudiubelu/test-images/windows-server-2022-part-2

Browse Source 
test images: Adds Windows Server 2022 to the BASEIMAGEs (part 2)
This commit is contained in:
Kubernetes Prow Robot 2021-08-30 12:07:13 -07:00 committed by GitHub
commit ff617edd32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/README.md
View File

@ -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.

7
test/images/agnhost/BASEIMAGE
View File

@ -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

5
test/images/agnhost/README.md
View File

@ -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`).

7
test/images/echoserver/BASEIMAGE
View File

@ -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

7
test/images/httpd-new/BASEIMAGE
View File

@ -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

2
test/images/httpd-new/Dockerfile_windows
View File

@ -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

7
test/images/httpd/BASEIMAGE
View File

@ -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

7
test/images/jessie-dnsutils/BASEIMAGE
View File

@ -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

17
test/images/kitten/BASEIMAGE
View File

@ -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

17
test/images/nautilus/BASEIMAGE
View File

@ -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

7
test/images/nginx-new/BASEIMAGE
View File

@ -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

7
test/images/nginx/BASEIMAGE
View File

@ -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

1
test/images/nonroot/BASEIMAGE
View File

@ -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

7
test/images/redis/BASEIMAGE
View File

@ -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

1
test/images/resource-consumer/BASEIMAGE
View File

@ -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

1
test/images/sample-apiserver/BASEIMAGE
View File

@ -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

1
test/images/windows-nanoserver/BASEIMAGE
View File

@ -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