From ecd543be044f82b721ffaa1909f5a4fefe458a64 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Fri, 7 Oct 2022 10:16:15 -0700 Subject: [PATCH] Remove out-of-support Windows 20H2 images Signed-off-by: Mark Rossetti --- build/dependencies.yaml | 2 +- build/pause/CHANGELOG.md | 6 +++++- build/pause/Makefile | 10 +++++----- cluster/images/etcd/Makefile | 6 +++--- test/images/README.md | 4 ++-- test/images/agnhost/BASEIMAGE | 1 - test/images/agnhost/README.md | 2 +- test/images/agnhost/VERSION | 2 +- test/images/busybox/BASEIMAGE | 1 - test/images/busybox/VERSION | 2 +- test/images/httpd-new/BASEIMAGE | 1 - test/images/httpd-new/VERSION | 2 +- test/images/httpd/BASEIMAGE | 1 - test/images/httpd/VERSION | 2 +- test/images/image-util.sh | 2 +- test/images/jessie-dnsutils/BASEIMAGE | 1 - test/images/jessie-dnsutils/VERSION | 2 +- test/images/kitten/BASEIMAGE | 1 - test/images/kitten/VERSION | 2 +- test/images/nautilus/BASEIMAGE | 1 - test/images/nautilus/VERSION | 2 +- test/images/nginx-new/BASEIMAGE | 1 - test/images/nginx-new/VERSION | 2 +- test/images/nginx/BASEIMAGE | 1 - test/images/nginx/VERSION | 2 +- test/images/nonroot/BASEIMAGE | 1 - test/images/nonroot/VERSION | 2 +- test/images/redis/BASEIMAGE | 1 - test/images/redis/VERSION | 2 +- test/images/resource-consumer/BASEIMAGE | 1 - test/images/resource-consumer/VERSION | 2 +- test/images/sample-apiserver/BASEIMAGE | 1 - test/images/sample-apiserver/VERSION | 2 +- test/images/windows-nanoserver/BASEIMAGE | 1 - test/images/windows-nanoserver/VERSION | 2 +- test/images/windows-servercore-cache/BASEIMAGE | 1 - test/images/windows-servercore-cache/VERSION | 2 +- 37 files changed, 33 insertions(+), 44 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index fc2b7a493ef..f17311ad33d 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -145,7 +145,7 @@ dependencies: match: __default_go_runner_version= - name: "registry.k8s.io/pause" - version: 3.8 + version: 3.9 refPaths: - path: build/pause/Makefile match: TAG\s*\?= diff --git a/build/pause/CHANGELOG.md b/build/pause/CHANGELOG.md index d2379031693..4fb63bdf2d4 100644 --- a/build/pause/CHANGELOG.md +++ b/build/pause/CHANGELOG.md @@ -1,3 +1,7 @@ +# 3.9 + +* Unsupported Windows Semi-Annual Channel container images removed (OS Versions removed: 20H2). ([#112924](https://github.com/kubernetes/kubernetes/pull/112924), [@marosset](https://github.com/marosset)) + # 3.8 * Updating base image for Windows container images from nanoserver to `mcr.microsoft.com/oss/kubernetes/windows-pause-image-base` which gets built on a Windows machine. @@ -5,7 +9,7 @@ This addresses [Cannot modify registry keys during Windows pause image build pro # 3.7 -* Unsupported Windows Semi-Annual container images removed (OS Versions removed: 1903, 1909, 2004) . ([#107056](https://github.com/kubernetes/kubernetes/pull/107056), [@jsturtevant](https://github.com/jsturtevant/)) +* Unsupported Windows Semi-Annual Channel container images removed (OS Versions removed: 1903, 1909, 2004). ([#107056](https://github.com/kubernetes/kubernetes/pull/107056), [@jsturtevant](https://github.com/jsturtevant/)) # 3.6 diff --git a/build/pause/Makefile b/build/pause/Makefile index 256a9fd194d..c0a82e81683 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -17,15 +17,15 @@ REGISTRY ?= staging-k8s.gcr.io IMAGE = $(REGISTRY)/pause -TAG ?= 3.8 +TAG ?= 3.9 REV = $(shell git describe --contains --always --match='v*') # Architectures supported: amd64, arm, arm64, ppc64le and s390x ARCH ?= amd64 # Operating systems supported: linux, windows OS ?= linux -# OS Version for the Windows images: 1809, 20H2, ltsc2022 -OSVERSION ?= 1809 20H2 ltsc2022 +# OS Version for the Windows images: 1809, ltsc2022 +OSVERSION ?= 1809 ltsc2022 # The output type could either be docker (local), or registry. # If it is registry, it will also allow us to push the Windows images. @@ -35,7 +35,7 @@ ALL_OS = linux windows ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) ALL_ARCH.windows = amd64 -ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022 +ALL_OSVERSIONS.windows := 1809 ltsc2022 ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-$(arch)-${osversion})) ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}}) @@ -89,7 +89,7 @@ push-manifest: # to the kernel version for that OS release (ex: 20348 for Windows Server 2022). This is needed to fetch the servicing revision from the # pause base image manifest (which containers an entry for each Windows Server version) so we can add the approrite 'os.version' # field to the pause image manifest. - declare -A tagToKernelVersionMap=( ['1809']='17763' ['20H2']='19042' ['ltsc2022']='20348' );\ + declare -A tagToKernelVersionMap=( ['1809']='17763' ['ltsc2022']='20348' );\ for arch in $(ALL_ARCH.windows); do \ for osversion in ${ALL_OSVERSIONS.windows}; do \ full_version=`docker manifest inspect ${BASE.windows} | grep "10.0.$${tagToKernelVersionMap[$$osversion]}" | head -n 1 | awk -F\" '{print $$4}'` || true; \ diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 721857783ef..e06c287a280 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.5.5 # REVISION provides a version number for this image and all it's bundled # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment # for each revision of this image at that etcd version. -REVISION?=0 +REVISION?=1 # IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) @@ -43,7 +43,7 @@ ARCH?=amd64 # Operating systems supported: linux, windows OS ?= linux -# OS Version for the Windows images: 1809, 20H2, ltsc2022 +# OS Version for the Windows images: 1809, ltsc2022 OSVERSION ?= 1809 # The output type could either be docker (local), or registry. @@ -54,7 +54,7 @@ ALL_OS = linux windows ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) ALL_ARCH.windows = amd64 -ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022 +ALL_OSVERSIONS.windows := 1809 ltsc2022 ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-$(arch)-${osversion})) ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}}) diff --git a/test/images/README.md b/test/images/README.md index 6d530e70529..15d9e3d3db4 100644 --- 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. diff --git a/test/images/agnhost/BASEIMAGE b/test/images/agnhost/BASEIMAGE index e33c2d03c88..d72b21fa112 100644 --- 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 diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md index 86e73f3f0db..ab4fe8bd44a 100644 --- 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`). diff --git a/test/images/agnhost/VERSION b/test/images/agnhost/VERSION index 4bdd32f8334..d920eceb604 100644 --- a/test/images/agnhost/VERSION +++ b/test/images/agnhost/VERSION @@ -1 +1 @@ -2.40 +2.41 diff --git a/test/images/busybox/BASEIMAGE b/test/images/busybox/BASEIMAGE index d83d76490fd..2a5463c9d4f 100644 --- 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 diff --git a/test/images/busybox/VERSION b/test/images/busybox/VERSION index c857497c5b8..3d9cd2a913d 100644 --- a/test/images/busybox/VERSION +++ b/test/images/busybox/VERSION @@ -1 +1 @@ -1.29-3 +1.29-4 diff --git a/test/images/httpd-new/BASEIMAGE b/test/images/httpd-new/BASEIMAGE index cd8e94e689a..561825ea686 100644 --- 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 diff --git a/test/images/httpd-new/VERSION b/test/images/httpd-new/VERSION index 513bcb43dd4..2d1d6febf14 100644 --- a/test/images/httpd-new/VERSION +++ b/test/images/httpd-new/VERSION @@ -1 +1 @@ -2.4.39-3 +2.4.39-4 diff --git a/test/images/httpd/BASEIMAGE b/test/images/httpd/BASEIMAGE index 116ac54e7fe..df7dae1983c 100644 --- 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 diff --git a/test/images/httpd/VERSION b/test/images/httpd/VERSION index a4118661e35..e26e344226e 100644 --- a/test/images/httpd/VERSION +++ b/test/images/httpd/VERSION @@ -1 +1 @@ -2.4.38-3 +2.4.38-4 diff --git a/test/images/image-util.sh b/test/images/image-util.sh index 2b211868c10..7f95395c025 100755 --- 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() { diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE index fc3db23e9a6..76dd97afd76 100644 --- 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 diff --git a/test/images/jessie-dnsutils/VERSION b/test/images/jessie-dnsutils/VERSION index 810ee4e91e2..d3bdbdf1fda 100644 --- a/test/images/jessie-dnsutils/VERSION +++ b/test/images/jessie-dnsutils/VERSION @@ -1 +1 @@ -1.6 +1.7 diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE index ad89430e1a6..cbe3db3e8b8 100644 --- 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 diff --git a/test/images/kitten/VERSION b/test/images/kitten/VERSION index 810ee4e91e2..d3bdbdf1fda 100644 --- a/test/images/kitten/VERSION +++ b/test/images/kitten/VERSION @@ -1 +1 @@ -1.6 +1.7 diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE index ad89430e1a6..cbe3db3e8b8 100644 --- 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 diff --git a/test/images/nautilus/VERSION b/test/images/nautilus/VERSION index 810ee4e91e2..d3bdbdf1fda 100644 --- a/test/images/nautilus/VERSION +++ b/test/images/nautilus/VERSION @@ -1 +1 @@ -1.6 +1.7 diff --git a/test/images/nginx-new/BASEIMAGE b/test/images/nginx-new/BASEIMAGE index 30938a40d25..33a241e8b3c 100644 --- 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 diff --git a/test/images/nginx-new/VERSION b/test/images/nginx-new/VERSION index d0e0cf80cd8..18a6a00cd06 100644 --- a/test/images/nginx-new/VERSION +++ b/test/images/nginx-new/VERSION @@ -1 +1 @@ -1.15-3 +1.15-4 diff --git a/test/images/nginx/BASEIMAGE b/test/images/nginx/BASEIMAGE index 886bf79daa5..1fb5c73f207 100644 --- 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 diff --git a/test/images/nginx/VERSION b/test/images/nginx/VERSION index 3990511cacc..72002739481 100644 --- a/test/images/nginx/VERSION +++ b/test/images/nginx/VERSION @@ -1 +1 @@ -1.14-3 +1.14-4 diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index 51be60a5e3c..d920620cbb5 100644 --- 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 diff --git a/test/images/nonroot/VERSION b/test/images/nonroot/VERSION index 7e32cd56983..c068b2447cc 100644 --- a/test/images/nonroot/VERSION +++ b/test/images/nonroot/VERSION @@ -1 +1 @@ -1.3 +1.4 diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE index 601049b2a3d..d8390c27ce9 100644 --- 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 diff --git a/test/images/redis/VERSION b/test/images/redis/VERSION index 424d0f572cf..3af89d37bda 100644 --- a/test/images/redis/VERSION +++ b/test/images/redis/VERSION @@ -1 +1 @@ -5.0.5-2 +5.0.5-3 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 0b2a75d4384..85dba0c124d 100644 --- 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 diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION index 09601587019..809bdcb851d 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.11 +1.12 diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE index c5d0505c1e5..f51a687e2f3 100644 --- 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 diff --git a/test/images/sample-apiserver/VERSION b/test/images/sample-apiserver/VERSION index 622f042fdce..3661bc0374e 100644 --- a/test/images/sample-apiserver/VERSION +++ b/test/images/sample-apiserver/VERSION @@ -1 +1 @@ -1.17.6 +1.17.7 diff --git a/test/images/windows-nanoserver/BASEIMAGE b/test/images/windows-nanoserver/BASEIMAGE index 0c29c65e0a0..d6c2e8c5ea0 100644 --- 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 diff --git a/test/images/windows-nanoserver/VERSION b/test/images/windows-nanoserver/VERSION index 8c1384d825d..29ef827e8a4 100644 --- a/test/images/windows-nanoserver/VERSION +++ b/test/images/windows-nanoserver/VERSION @@ -1 +1 @@ -v2 +v3 diff --git a/test/images/windows-servercore-cache/BASEIMAGE b/test/images/windows-servercore-cache/BASEIMAGE index db8b97a51f6..d1e7c8d0797 100644 --- 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 diff --git a/test/images/windows-servercore-cache/VERSION b/test/images/windows-servercore-cache/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/windows-servercore-cache/VERSION +++ b/test/images/windows-servercore-cache/VERSION @@ -1 +1 @@ -1.0 +1.1