Remove out-of-support Windows 20H2 images

Signed-off-by: Mark Rossetti <marosset@microsoft.com>
2025-09-08 20:50:24 +00:00 · 2022-10-07 10:16:15 -07:00
parent e11e226b23
commit ecd543be04
37 changed files with 33 additions and 44 deletions
--- a/test/images/README.md
+++ b/test/images/README.md
@@ -94,8 +94,8 @@ the regular image building process. This helper image can be found in at `e2etea
 It can be used by anyone, but if you need to build your own, you can read more about it [here](windows/README.md).

 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),
-20H2, ltsc2022. In order to add support for a new Windows OS version, a new entry for that OS version will have
+the host OS version. For this reason, we build test images for different Windows OS Versions: 1809 (Windows Server 2019)
+and ltsc2022 (Windows Server 2022). 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.

--- a/test/images/agnhost/BASEIMAGE
+++ b/test/images/agnhost/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/agnhost/README.md
+++ b/test/images/agnhost/README.md
@@ -668,5 +668,5 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i
 ## Image

 The image can be found at `registry.k8s.io/e2e-test-images/agnhost:2.40` for both Linux and
-Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, `mcr.microsoft.com/windows/nanoserver:20H2`, and
+Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809` and
 `mcr.microsoft.com/windows/nanoserver:ltsc2022`).
--- a/test/images/agnhost/VERSION
+++ b/test/images/agnhost/VERSION
@@ -1 +1 @@
-2.40
+2.41
--- a/test/images/busybox/BASEIMAGE
+++ b/test/images/busybox/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=mcr.microsoft.com/windows/nanoserver:20H2
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
--- a/test/images/busybox/VERSION
+++ b/test/images/busybox/VERSION
@@ -1 +1 @@
-1.29-3
+1.29-4
--- a/test/images/httpd-new/BASEIMAGE
+++ b/test/images/httpd-new/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/httpd-new/VERSION
+++ b/test/images/httpd-new/VERSION
@@ -1 +1 @@
-2.4.39-3
+2.4.39-4
--- a/test/images/httpd/BASEIMAGE
+++ b/test/images/httpd/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/httpd/VERSION
+++ b/test/images/httpd/VERSION
@@ -1 +1 @@
-2.4.38-3
+2.4.38-4
--- a/test/images/image-util.sh
+++ b/test/images/image-util.sh
@@ -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 20H2 ltsc2022)
+windows_os_versions=(1809 ltsc2022)
 declare -A WINDOWS_OS_VERSIONS_MAP

 initWindowsOsVersions() {
--- a/test/images/jessie-dnsutils/BASEIMAGE
+++ b/test/images/jessie-dnsutils/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/jessie-dnsutils/VERSION
+++ b/test/images/jessie-dnsutils/VERSION
@@ -1 +1 @@
-1.6
+1.7
--- a/test/images/kitten/BASEIMAGE
+++ b/test/images/kitten/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/agnhost:2.33-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/agnhost:2.33-windows-amd64-ltsc2022
--- a/test/images/kitten/VERSION
+++ b/test/images/kitten/VERSION
@@ -1 +1 @@
-1.6
+1.7
--- a/test/images/nautilus/BASEIMAGE
+++ b/test/images/nautilus/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/agnhost:2.33-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/agnhost:2.33-windows-amd64-ltsc2022
--- a/test/images/nautilus/VERSION
+++ b/test/images/nautilus/VERSION
@@ -1 +1 @@
-1.6
+1.7
--- a/test/images/nginx-new/BASEIMAGE
+++ b/test/images/nginx-new/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/nginx-new/VERSION
+++ b/test/images/nginx-new/VERSION
@@ -1 +1 @@
-1.15-3
+1.15-4
--- a/test/images/nginx/BASEIMAGE
+++ b/test/images/nginx/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/nginx/VERSION
+++ b/test/images/nginx/VERSION
@@ -1 +1 @@
-1.14-3
+1.14-4
--- a/test/images/nonroot/BASEIMAGE
+++ b/test/images/nonroot/BASEIMAGE
@@ -4,5 +4,4 @@ linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0
 linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0
 linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
-windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
--- a/test/images/nonroot/VERSION
+++ b/test/images/nonroot/VERSION
@@ -1 +1 @@
-1.3
+1.4
--- a/test/images/redis/BASEIMAGE
+++ b/test/images/redis/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2
 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
--- a/test/images/redis/VERSION
+++ b/test/images/redis/VERSION
@@ -1 +1 @@
-5.0.5-2
+5.0.5-3
--- a/test/images/resource-consumer/BASEIMAGE
+++ b/test/images/resource-consumer/BASEIMAGE
@@ -4,5 +4,4 @@ linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1
 linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1
 linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
-windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
--- a/test/images/resource-consumer/VERSION
+++ b/test/images/resource-consumer/VERSION
@@ -1 +1 @@
-1.11
+1.12
--- a/test/images/sample-apiserver/BASEIMAGE
+++ b/test/images/sample-apiserver/BASEIMAGE
@@ -4,5 +4,4 @@ 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/20H2=mcr.microsoft.com/windows/nanoserver:20H2
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
--- a/test/images/sample-apiserver/VERSION
+++ b/test/images/sample-apiserver/VERSION
@@ -1 +1 @@
-1.17.6
+1.17.7
--- a/test/images/windows-nanoserver/BASEIMAGE
+++ b/test/images/windows-nanoserver/BASEIMAGE
@@ -1,3 +1,2 @@
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
-windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
--- a/test/images/windows-nanoserver/VERSION
+++ b/test/images/windows-nanoserver/VERSION
@@ -1 +1 @@
-v2
+v3
--- a/test/images/windows-servercore-cache/BASEIMAGE
+++ b/test/images/windows-servercore-cache/BASEIMAGE
@@ -1,3 +1,2 @@
 linux/amd64/1809=mcr.microsoft.com/windows/servercore:ltsc2019
-linux/amd64/20H2=mcr.microsoft.com/windows/servercore:20H2
 linux/amd64/ltsc2022=mcr.microsoft.com/windows/servercore:ltsc2022
--- a/test/images/windows-servercore-cache/VERSION
+++ b/test/images/windows-servercore-cache/VERSION
@@ -1 +1 @@
-1.0
+1.1
@@ -1 +1 @@
 .40
 .41
@@ -1 +1 @@
 .29-3
 .29-4
@@ -1 +1 @@
 .4.39-3
 .4.39-4
@@ -1 +1 @@
 .4.38-3
 .4.38-4
@@ -1 +1 @@
 .6
 .7
@@ -1 +1 @@
 .15-3
 .15-4
@@ -1 +1 @@
 .14-3
 .14-4
@@ -1 +1 @@
 .3
 .4
@@ -1 +1 @@
 .0.5-2
 .0.5-3
@@ -1 +1 @@
 .11
 .12