github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97322 from claudiubelu/windows/20h2-pause-image

Browse Source 
pause image: Adds 20H2 Windows OS Version base image
This commit is contained in:
Kubernetes Prow Robot 2020-12-18 08:46:25 -08:00 committed by GitHub
commit 6fff9581c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/pause/Makefile
View File

@ -25,8 +25,8 @@ REV = $(shell git describe --contains --always --match='v*')
ARCH ?= amd64 ARCH ?= amd64
# Operating systems supported: linux, windows # Operating systems supported: linux, windows
OS ?= linux OS ?= linux
# OS Version for the Windows images: 1809, 1903, 1909 2004 # OS Version for the Windows images: 1809, 1903, 1909 2004, 20H2
OSVERSION ?= 1809 1903 1909 2004 OSVERSION ?= 1809 1903 1909 2004 20H2
# The output type could either be docker (local), or registry. # The output type could either be docker (local), or registry.
# If it is registry, it will also allow us to push the Windows images. # If it is registry, it will also allow us to push the Windows images.
@ -36,7 +36,7 @@ ALL_OS = linux windows
ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x
ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
ALL_ARCH.windows = amd64 ALL_ARCH.windows = amd64
ALL_OSVERSIONS.windows := 1809 1903 1909 2004 ALL_OSVERSIONS.windows := 1809 1903 1909 2004 20H2
ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-$(arch)-${osversion})) 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}}) ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})