github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 17:57:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112924 from marosset/remove-20h2-windows-images

Browse Source 
cleanup: Remove out-of-support Windows 20H2 images
This commit is contained in:
Kubernetes Prow Robot
2022-10-13 11:25:15 -07:00
committed by GitHub
parent 01019770cf ecd543be04
commit b601769721
37 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@@ -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*\?=

6
build/pause/CHANGELOG.md
View File

@@ -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

10
build/pause/Makefile
View File

@@ -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; \