github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +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

6
cluster/images/etcd/Makefile
View File

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