github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107055 from jsturtevant/remove-unsupported-sac

Browse Source 
Remove unsupported Windows SAC  test images
This commit is contained in:
Kubernetes Prow Robot 2022-03-11 16:32:23 -08:00 committed by GitHub
commit d2ce895e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 17 additions and 34 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, ltsc2022. In order add support for a new Windows OS version, a new entry for that OS version will have
20H2, ltsc2022. In order to 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.

1
test/images/agnhost/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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-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

@ -667,7 +667,6 @@ 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.33` for both Linux and
Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`,
`mcr.microsoft.com/windows/nanoserver:2004`, `mcr.microsoft.com/windows/nanoserver:20H2`, and
The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.35` for both Linux and
Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, `mcr.microsoft.com/windows/nanoserver:20H2`, and
`mcr.microsoft.com/windows/nanoserver:ltsc2022`).

1
test/images/busybox/BASEIMAGE
View File

@ -4,6 +4,5 @@ linux/arm64=arm64v8/busybox:1.29
linux/ppc64le=ppc64le/busybox:1.29
linux/s390x=s390x/busybox:1.29
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

2
test/images/busybox/VERSION
View File

@ -1 +1 @@
1.29-2
1.29-3

1
test/images/echoserver/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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-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/httpd-new/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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-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/VERSION
View File

@ -1 +1 @@
2.4.39-2
2.4.39-3

1
test/images/httpd/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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-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/VERSION
View File

@ -1 +1 @@
2.4.38-2
2.4.38-3

2
test/images/image-util.sh
View File

@ -39,7 +39,7 @@ declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["pp
# NOTE(claudiub): In the test image build jobs, this script is not being run in a git repository,
# which would cause git log to fail. Instead, we can use the GIT_COMMIT_ID set in cloudbuild.yaml.
GIT_COMMIT_ID=$(git log -1 --format=%h || echo "${GIT_COMMIT_ID}")
windows_os_versions=(1809 2004 20H2 ltsc2022)
windows_os_versions=(1809 20H2 ltsc2022)
declare -A WINDOWS_OS_VERSIONS_MAP
initWindowsOsVersions() {

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

@ -4,6 +4,5 @@ linux/arm64=arm64v8/debian:jessie
linux/ppc64le=ppc64le/debian:jessie
linux/s390x=s390x/debian:jessie
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/jessie-dnsutils/VERSION
View File

@ -1 +1 @@
1.5
1.6

1
test/images/kitten/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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

2
test/images/kitten/VERSION
View File

@ -1 +1 @@
1.5
1.6

1
test/images/nautilus/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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

2
test/images/nautilus/VERSION
View File

@ -1 +1 @@
1.5
1.6

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

@ -4,6 +4,5 @@ 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-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/nginx-new/VERSION
View File

@ -1 +1 @@
1.15-2
1.15-3

1
test/images/nginx/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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-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/nginx/VERSION
View File

@ -1 +1 @@
1.14-2
1.14-3

1
test/images/nonroot/BASEIMAGE
View File

@ -4,6 +4,5 @@ linux/arm64=k8s.gcr.io/debian-base-arm64:v1.0.0
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:v1.0.0
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

2
test/images/nonroot/VERSION
View File

@ -1 +1 @@
1.2
1.3

1
test/images/redis/BASEIMAGE
View File

@ -4,6 +4,5 @@ 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-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/redis/VERSION
View File

@ -1 +1 @@
5.0.5-1
5.0.5-2

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

@ -4,6 +4,5 @@ linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1
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

2
test/images/resource-consumer/VERSION
View File

@ -1 +1 @@
1.10
1.11

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

@ -4,6 +4,5 @@ linux/arm64=arm64v8/alpine:3.8
linux/ppc64le=ppc64le/alpine:3.8
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

2
test/images/sample-apiserver/VERSION
View File

@ -1 +1 @@
1.17.5
1.17.6

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

@ -1,4 +1,3 @@
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

2
test/images/windows-nanoserver/VERSION
View File

@ -1 +1 @@
v1
v2

1
test/images/windows-servercore-cache/BASEIMAGE
View File

@ -1,4 +1,3 @@
linux/amd64/1809=mcr.microsoft.com/windows/servercore:ltsc2019
linux/amd64/2004=mcr.microsoft.com/windows/servercore:2004
linux/amd64/20H2=mcr.microsoft.com/windows/servercore:20H2
linux/amd64/ltsc2022=mcr.microsoft.com/windows/servercore:ltsc2022