Skip to content

Commit

Permalink
Merge pull request #1127 from aramase/remove-eol-win
Browse files Browse the repository at this point in the history
chore: remove windows version 1903, 1909 and 2004 (EOL)
  • Loading branch information
k8s-ci-robot committed Dec 21, 2022
2 parents 1577f32 + 1b6d197 commit 4eaa7c6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ ALL_OS = linux windows
ALL_ARCH.linux = amd64 arm64
ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
ALL_ARCH.windows = amd64
ALL_OSVERSIONS.windows := 1809 1903 1909 2004 ltsc2022
ALL_OSVERSIONS.windows := 1809 ltsc2022
ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-${osversion}-${arch}))
ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})

# The current context of image building
# The architecture of the image
ARCH ?= amd64
# OS Version for the Windows images: 1809, 1903, 1909, 2004, ltsc2022
# OS Version for the Windows images: 1809, ltsc2022
OSVERSION ?= 1809
# Output type of docker buildx build
OUTPUT_TYPE ?= registry
Expand Down
3 changes: 0 additions & 3 deletions docker/BASEIMAGE
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
linux/amd64=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2
linux/arm64=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909
windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
3 changes: 0 additions & 3 deletions docker/BASEIMAGE_CORE
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
windows/amd64/1809=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-1809
windows/amd64/1903=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-1903
windows/amd64/1909=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-1909
windows/amd64/2004=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-2004
windows/amd64/ltsc2022=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-ltsc2022

0 comments on commit 4eaa7c6

Please sign in to comment.