github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107056 from jsturtevant/remove-sac-from-pause

Browse Source 
Remove unsupported Windows SAC images from pause image
This commit is contained in:
Kubernetes Prow Robot 2022-03-11 16:32:34 -08:00 committed by GitHub
commit b2c5bd2a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -144,7 +144,7 @@ dependencies:
match: __default_go_runner_version= match: __default_go_runner_version=
- name: "k8s.gcr.io/pause" - name: "k8s.gcr.io/pause"
version: 3.6 version: 3.7
refPaths: refPaths:
- path: build/pause/Makefile - path: build/pause/Makefile
match: TAG\s*\?= match: TAG\s*\?=

4
build/pause/CHANGELOG.md
View File

@ -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 # 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)) * Support for Windows container images (OS Versions: 2022) was added. ([#104438](https://github.com/kubernetes/kubernetes/pull/104438), [@nick5616](https://github.com/nick5616))

8
build/pause/Makefile
View File

@ -17,15 +17,15 @@
REGISTRY ?= staging-k8s.gcr.io REGISTRY ?= staging-k8s.gcr.io
IMAGE = $(REGISTRY)/pause IMAGE = $(REGISTRY)/pause
TAG ?= 3.6 TAG ?= 3.7
REV = $(shell git describe --contains --always --match='v*') REV = $(shell git describe --contains --always --match='v*')
# Architectures supported: amd64, arm, arm64, ppc64le and s390x # Architectures supported: amd64, arm, arm64, ppc64le and s390x
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, 20H2, ltsc2022 # OS Version for the Windows images: 1809, 20H2, ltsc2022
OSVERSION ?= 1809 1903 1909 2004 20H2 ltsc2022 OSVERSION ?= 1809 20H2 ltsc2022
# 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.
@ -35,7 +35,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 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.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}})