github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Update Debian base images

Browse Source 
- debian-base:bullseye-v1.2.0
- debian-iptables:bullseye-v1.3.0
- setcap:bullseye-v1.2.0

Signed-off-by: Stephen Augustus <foo@auggie.dev>
This commit is contained in:
Stephen Augustus 2022-04-13 16:13:09 -04:00
parent 75e49ec824
commit cddd83c997
No known key found for this signature in database
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/common.sh
View File

@ -90,9 +90,9 @@ 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=bullseye-v1.1.0
readonly __default_debian_iptables_version=bullseye-v1.3.0
readonly __default_go_runner_version=v2.3.1-go1.18.1-bullseye.0
readonly __default_setcap_version=bullseye-v1.0.0
readonly __default_setcap_version=bullseye-v1.2.0
# These are the base images for the Docker-wrapped binaries.
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"

6
build/dependencies.yaml
View File

@ -114,7 +114,7 @@ dependencies:
# Base images
- name: "k8s.gcr.io/debian-base: dependents"
version: bullseye-v1.0.0
version: bullseye-v1.2.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-]+)*))?)
@ -130,7 +130,7 @@ dependencies:
match: BASE_IMAGE_VERSION\?=
- name: "k8s.gcr.io/debian-iptables: dependents"
version: bullseye-v1.1.0
version: bullseye-v1.3.0
refPaths:
- path: build/common.sh
match: __default_debian_iptables_version=
@ -206,7 +206,7 @@ dependencies:
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
- name: "k8s.gcr.io/setcap: dependents"
version: bullseye-v1.0.0
version: bullseye-v1.2.0
refPaths:
- path: build/common.sh
match: __default_setcap_version=

10
cluster/images/etcd/Makefile
View File

@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
DOCKERFILE := ${DOCKERFILE.${OS}}
ifeq ($(ARCH),amd64)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.2.0
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.0.0
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.2.0
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.0.0
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.2.0
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.0.0
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.2.0
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.0.0
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.2.0
endif
BASE.windows = mcr.microsoft.com/windows/nanoserver

2
test/conformance/image/Makefile
View File

@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
# This is defined in root Makefile, but some build contexts do not refer to them
KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io
BASE_IMAGE_VERSION?=bullseye-v1.0.0
BASE_IMAGE_VERSION?=bullseye-v1.2.0
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
# Keep debian releases (e.g. debian 11 == bullseye) consistent

2
test/utils/image/manifest.go
View File

@ -240,7 +240,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) {
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-2"}
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.1.0"}
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.3.0"}
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.1-0"}
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}