Merge pull request kubernetes#102599 from claudiubelu/test-images/remove-eol-windows-images

k8s-ci-robot · web-flow · commit 4c498db939d6 · 2021-08-12T09:09:48.000-07:00
test images: Removes Windows 1903 and 1909 images
diff --git 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, 1903,
-1909, 2004, 20H2. In order 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),
+2004, 20H2. 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
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md
@@ -643,6 +643,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.21` for both Linux and
-Windows containers (based on `mcr.microsoft.com/windows/servercore:ltsc2019`,
-`mcr.microsoft.com/windows/servercore:1903`, and `mcr.microsoft.com/windows/servercore:1909`).
+The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.32` 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`).
diff --git a/test/images/busybox/BASEIMAGE b/test/images/busybox/BASEIMAGE
@@ -4,7 +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/1903=mcr.microsoft.com/windows/nanoserver:1903
-windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/test/images/busybox/VERSION b/test/images/busybox/VERSION
@@ -1 +1 @@
-1.29-1
+1.29-2
diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/echoserver/VERSION b/test/images/echoserver/VERSION
@@ -1 +1 @@
-2.3
+2.4
diff --git a/test/images/httpd-new/BASEIMAGE b/test/images/httpd-new/BASEIMAGE
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/httpd-new/VERSION b/test/images/httpd-new/VERSION
@@ -1 +1 @@
-2.4.39-1
+2.4.39-2
diff --git a/test/images/httpd/BASEIMAGE b/test/images/httpd/BASEIMAGE
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/httpd/VERSION b/test/images/httpd/VERSION
@@ -1 +1 @@
-2.4.38-1
+2.4.38-2
diff --git a/test/images/image-util.sh b/test/images/image-util.sh
@@ -37,7 +37,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh"
 declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["ppc64le"]="ppc64le" ["s390x"]="s390x" )
 
 GIT_COMMIT_ID=$(git log -1 --format=%h)
-windows_os_versions=(1809 1903 1909 2004 20H2)
+windows_os_versions=(1809 2004 20H2)
 declare -A WINDOWS_OS_VERSIONS_MAP
 
 initWindowsOsVersions() {
diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE
@@ -4,7 +4,5 @@ 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/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/jessie-dnsutils/VERSION b/test/images/jessie-dnsutils/VERSION
@@ -1 +1 @@
-1.4
+1.5
diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE
@@ -4,7 +4,5 @@ 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/1903=REGISTRY/agnhost:2.26-windows-amd64-1903
-windows/amd64/1909=REGISTRY/agnhost:2.26-windows-amd64-1909
 windows/amd64/2004=REGISTRY/agnhost:2.26-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/agnhost:2.26-windows-amd64-20H2
diff --git a/test/images/kitten/VERSION b/test/images/kitten/VERSION
@@ -1 +1 @@
-1.4
+1.5
diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE
@@ -4,7 +4,5 @@ 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/1903=REGISTRY/agnhost:2.26-windows-amd64-1903
-windows/amd64/1909=REGISTRY/agnhost:2.26-windows-amd64-1909
 windows/amd64/2004=REGISTRY/agnhost:2.26-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/agnhost:2.26-windows-amd64-20H2
diff --git a/test/images/nautilus/VERSION b/test/images/nautilus/VERSION
@@ -1 +1 @@
-1.4
+1.5
diff --git a/test/images/nginx-new/BASEIMAGE b/test/images/nginx-new/BASEIMAGE
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/nginx-new/VERSION b/test/images/nginx-new/VERSION
@@ -1 +1 @@
-1.15-1
+1.15-2
diff --git a/test/images/nginx/BASEIMAGE b/test/images/nginx/BASEIMAGE
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/nginx/VERSION b/test/images/nginx/VERSION
@@ -1 +1 @@
-1.14-1
+1.14-2
diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE
@@ -4,7 +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/1903=mcr.microsoft.com/windows/nanoserver:1903
-windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/test/images/nonroot/VERSION b/test/images/nonroot/VERSION
@@ -1 +1 @@
-1.1
+1.2
diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE
@@ -4,7 +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-windows-amd64-1809
-windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903
-windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909
 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004
 windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2
diff --git a/test/images/redis/VERSION b/test/images/redis/VERSION
@@ -1 +1 @@
-5.0.5-alpine
+5.0.5-1
diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE
@@ -4,7 +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/1903=mcr.microsoft.com/windows/nanoserver:1903
-windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION
@@ -1 +1 @@
-1.9
+1.10
diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE
@@ -4,7 +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/1903=mcr.microsoft.com/windows/nanoserver:1903
-windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/test/images/sample-apiserver/VERSION b/test/images/sample-apiserver/VERSION
@@ -1 +1 @@
-1.17.4
+1.17.5
diff --git a/test/images/windows-nanoserver/BASEIMAGE b/test/images/windows-nanoserver/BASEIMAGE
@@ -1,5 +1,3 @@
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
-windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
-windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/test/images/windows-servercore-cache/BASEIMAGE b/test/images/windows-servercore-cache/BASEIMAGE
@@ -1,5 +1,3 @@
 linux/amd64/1809=mcr.microsoft.com/windows/servercore:ltsc2019
-linux/amd64/1903=mcr.microsoft.com/windows/servercore:1903
-linux/amd64/1909=mcr.microsoft.com/windows/servercore:1909
 linux/amd64/2004=mcr.microsoft.com/windows/servercore:2004
 linux/amd64/20H2=mcr.microsoft.com/windows/servercore:20H2
