diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 73255566482..d3a5795a566 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -144,7 +144,7 @@ dependencies: match: __default_go_runner_version= - name: "k8s.gcr.io/pause" - version: 3.6 + version: 3.7 refPaths: - path: build/pause/Makefile match: TAG\s*\?= diff --git a/build/pause/CHANGELOG.md b/build/pause/CHANGELOG.md index a1203ba9eca..0d172df4db6 100644 --- a/build/pause/CHANGELOG.md +++ b/build/pause/CHANGELOG.md @@ -1,3 +1,7 @@ +# 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/)) + # 3.6 * Support for Windows container images (OS Versions: 2022) was added. ([#104438](https://github.com/kubernetes/kubernetes/pull/104438), [@nick5616](https://github.com/nick5616)) diff --git a/build/pause/Makefile b/build/pause/Makefile index 80e616d2210..82bb38dead7 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -17,15 +17,15 @@ REGISTRY ?= staging-k8s.gcr.io IMAGE = $(REGISTRY)/pause -TAG ?= 3.6 +TAG ?= 3.7 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, 1903, 1909 2004, 20H2, ltsc2022 -OSVERSION ?= 1809 1903 1909 2004 20H2 ltsc2022 +# OS Version for the Windows images: 1809, 20H2, ltsc2022 +OSVERSION ?= 1809 20H2 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 1903 1909 2004 20H2 ltsc2022 +ALL_OSVERSIONS.windows := 1809 20H2 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}})