Merge pull request #136951 from zylxjtu/master

Add the windows 2025 support for some e2e test images
2026-07-19 07:25:19 +00:00 · 2026-02-18 00:23:46 +05:30
parent 338a3bcef8 a34e0b242e
commit aaa8fe96de
16 changed files with 22 additions and 14 deletions
--- a/test/images/glibc-dns-testing/BASEIMAGE
+++ b/test/images/glibc-dns-testing/BASEIMAGE
@@ -2,5 +2,6 @@ linux/amd64=debian:bookworm-slim
 linux/arm64=arm64v8/debian:bookworm-slim
 linux/ppc64le=ppc64le/debian:bookworm-slim
 linux/s390x=s390x/debian:bookworm-slim
-windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809
-windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
+windows/amd64/1809=REGISTRY/busybox:1.37.0-2-windows-amd64-1809
+windows/amd64/ltsc2022=REGISTRY/busybox:1.37.0-2-windows-amd64-ltsc2022
+windows/amd64/ltsc2025=REGISTRY/busybox:1.37.0-2-windows-amd64-ltsc2025
--- a/test/images/glibc-dns-testing/VERSION
+++ b/test/images/glibc-dns-testing/VERSION
@@ -1 +1 @@
-2.0.0
+2.1.0
--- a/test/images/kitten/BASEIMAGE
+++ b/test/images/kitten/BASEIMAGE
@@ -4,3 +4,4 @@ linux/ppc64le=REGISTRY/agnhost:2.63.0-linux-ppc64le
 linux/s390x=REGISTRY/agnhost:2.63.0-linux-s390x
 windows/amd64/1809=REGISTRY/agnhost:2.63.0-windows-amd64-1809
 windows/amd64/ltsc2022=REGISTRY/agnhost:2.63.0-windows-amd64-ltsc2022
+windows/amd64/ltsc2025=REGISTRY/agnhost:2.63.0-windows-amd64-ltsc2025
--- a/test/images/kitten/VERSION
+++ b/test/images/kitten/VERSION
@@ -1 +1 @@
-1.8
+1.9
--- a/test/images/nautilus/BASEIMAGE
+++ b/test/images/nautilus/BASEIMAGE
@@ -4,3 +4,4 @@ linux/ppc64le=REGISTRY/agnhost:2.63.0-linux-ppc64le
 linux/s390x=REGISTRY/agnhost:2.63.0-linux-s390x
 windows/amd64/1809=REGISTRY/agnhost:2.63.0-windows-amd64-1809
 windows/amd64/ltsc2022=REGISTRY/agnhost:2.63.0-windows-amd64-ltsc2022
+windows/amd64/ltsc2025=REGISTRY/agnhost:2.63.0-windows-amd64-ltsc2025
--- a/test/images/nautilus/VERSION
+++ b/test/images/nautilus/VERSION
@@ -1 +1 @@
-1.8.0
+1.9.0
--- a/test/images/nginx-new/BASEIMAGE
+++ b/test/images/nginx-new/BASEIMAGE
@@ -2,5 +2,6 @@ linux/amd64=nginx:1.28-alpine
 linux/arm64=arm64v8/nginx:1.28-alpine
 linux/ppc64le=ppc64le/nginx:1.28-alpine
 linux/s390x=s390x/nginx:1.28-alpine
-windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809
-windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
+windows/amd64/1809=REGISTRY/busybox:1.37.0-2-windows-amd64-1809
+windows/amd64/ltsc2022=REGISTRY/busybox:1.37.0-2-windows-amd64-ltsc2022
+windows/amd64/ltsc2025=REGISTRY/busybox:1.37.0-2-windows-amd64-ltsc2025
--- a/test/images/nginx-new/VERSION
+++ b/test/images/nginx-new/VERSION
@@ -1 +1 @@
-1.28.0-0
+1.28.0-1
--- a/test/images/nginx/BASEIMAGE
+++ b/test/images/nginx/BASEIMAGE
@@ -2,5 +2,6 @@ linux/amd64=nginx:1.27-alpine
 linux/arm64=arm64v8/nginx:1.27-alpine
 linux/ppc64le=ppc64le/nginx:1.27-alpine
 linux/s390x=s390x/nginx:1.27-alpine
-windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809
-windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022
+windows/amd64/1809=REGISTRY/busybox:1.37.0-2-windows-amd64-1809
+windows/amd64/ltsc2022=REGISTRY/busybox:1.37.0-2-windows-amd64-ltsc2022
+windows/amd64/ltsc2025=REGISTRY/busybox:1.37.0-2-windows-amd64-ltsc2025
--- a/test/images/nginx/VERSION
+++ b/test/images/nginx/VERSION
@@ -1 +1 @@
-1.27.0-0
+1.27.0-1
--- a/test/images/nonroot/BASEIMAGE
+++ b/test/images/nonroot/BASEIMAGE
@@ -4,3 +4,4 @@ linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
 linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
+windows/amd64/ltsc2025=mcr.microsoft.com/windows/nanoserver:ltsc2025
--- a/test/images/nonroot/VERSION
+++ b/test/images/nonroot/VERSION
@@ -1 +1 @@
-1.5.0
+1.6.0
--- a/test/images/resource-consumer/BASEIMAGE
+++ b/test/images/resource-consumer/BASEIMAGE
@@ -4,3 +4,4 @@ linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
 linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
+windows/amd64/ltsc2025=mcr.microsoft.com/windows/nanoserver:ltsc2025
--- a/test/images/resource-consumer/VERSION
+++ b/test/images/resource-consumer/VERSION
@@ -1 +1 @@
-1.14.0
+1.15.0
--- a/test/images/sample-apiserver/BASEIMAGE
+++ b/test/images/sample-apiserver/BASEIMAGE
@@ -4,3 +4,4 @@ linux/ppc64le=ppc64le/alpine:3.22
 linux/s390x=s390x/alpine:3.22
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
+windows/amd64/ltsc2025=mcr.microsoft.com/windows/nanoserver:ltsc2025
--- a/test/images/sample-apiserver/VERSION
+++ b/test/images/sample-apiserver/VERSION
@@ -1 +1 @@
-1.33.7
+1.33.8
@@ -1 +1 @@
 .0.0
 .1.0
@@ -1 +1 @@
 .8
 .9
@@ -1 +1 @@
 .8.0
 .9.0
@@ -1 +1 @@
 .28.0-0
 .28.0-1
@@ -1 +1 @@
 .27.0-0
 .27.0-1
@@ -1 +1 @@
 .5.0
 .6.0
@@ -1 +1 @@
 .14.0
 .15.0
@@ -1 +1 @@
 .33.7
 .33.8