mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 09:52:49 +00:00
Merge pull request #112924 from marosset/remove-20h2-windows-images
cleanup: Remove out-of-support Windows 20H2 images
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
b601769721
@ -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*\?=
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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; \
|
||||
|
||||
@ -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 "<etcd-version>-<revision>".
|
||||
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}})
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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`).
|
||||
|
||||
@ -1 +1 @@
|
||||
2.40
|
||||
2.41
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.29-3
|
||||
1.29-4
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
2.4.39-3
|
||||
2.4.39-4
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
2.4.38-3
|
||||
2.4.38-4
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.6
|
||||
1.7
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.6
|
||||
1.7
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.6
|
||||
1.7
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.15-3
|
||||
1.15-4
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.14-3
|
||||
1.14-4
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.3
|
||||
1.4
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
5.0.5-2
|
||||
5.0.5-3
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.11
|
||||
1.12
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.17.6
|
||||
1.17.7
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
v2
|
||||
v3
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
1.0
|
||||
1.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user