mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
update debian-base to buster-v1.5.0 for CVEs
This commit is contained in:
parent
a55bd63172
commit
7e7a6284be
@ -86,7 +86,7 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
|
||||
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||
|
||||
# These are the default versions (image tags) for their respective base images.
|
||||
readonly __default_debian_iptables_version=buster-v1.5.0
|
||||
readonly __default_debian_iptables_version=buster-v1.6.0
|
||||
readonly __default_go_runner_version=v2.3.1-go1.16.1-buster.0
|
||||
|
||||
# These are the base images for the Docker-wrapped binaries.
|
||||
|
@ -132,7 +132,7 @@ dependencies:
|
||||
|
||||
# Base images
|
||||
- name: "k8s.gcr.io/debian-base: dependents"
|
||||
version: buster-v1.4.0
|
||||
version: buster-v1.5.0
|
||||
refPaths:
|
||||
- path: cluster/images/etcd/Makefile
|
||||
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
||||
@ -146,7 +146,7 @@ dependencies:
|
||||
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
||||
|
||||
- name: "k8s.gcr.io/debian-iptables: dependents"
|
||||
version: buster-v1.5.0
|
||||
version: buster-v1.6.0
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_debian_iptables_version=
|
||||
|
@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.4.13
|
||||
# REVISION provides a version number fo 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?=3
|
||||
REVISION?=4
|
||||
|
||||
# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
|
||||
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
|
||||
@ -67,19 +67,19 @@ GOARM?=7
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
|
||||
ifeq ($(ARCH),amd64)
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.4.0
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.5.0
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.4.0
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.5.0
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.4.0
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.5.0
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.4.0
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.5.0
|
||||
endif
|
||||
ifeq ($(ARCH),s390x)
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.4.0
|
||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.5.0
|
||||
endif
|
||||
|
||||
RUNNERIMAGE?=gcr.io/distroless/static:latest
|
||||
|
@ -223,7 +223,7 @@ func initImageConfigs() (map[int]Config, map[int]Config) {
|
||||
configs[CheckMetadataConcealment] = Config{promoterE2eRegistry, "metadata-concealment", "1.6"}
|
||||
configs[CudaVectorAdd] = Config{e2eRegistry, "cuda-vector-add", "1.0"}
|
||||
configs[CudaVectorAdd2] = Config{promoterE2eRegistry, "cuda-vector-add", "2.2"}
|
||||
configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.5.0"}
|
||||
configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.6.0"}
|
||||
configs[EchoServer] = Config{promoterE2eRegistry, "echoserver", "2.3"}
|
||||
configs[Etcd] = Config{gcEtcdRegistry, "etcd", "3.4.13-0"}
|
||||
configs[GlusterDynamicProvisioner] = Config{promoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"}
|
||||
|
Loading…
Reference in New Issue
Block a user