github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103235 from thejoycekung/debian-setcap-image-bump

Browse Source 
Update debian, debian-iptables, setcap images to pick up CVE fixes
This commit is contained in:
Kubernetes Prow Robot 2021-06-26 16:21:23 -07:00 committed by GitHub
commit e974bcd471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/common.sh
View File

@ -86,9 +86,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
readonly KUBE_CONTAINER_RSYNC_PORT=8730 readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images. # These are the default versions (image tags) for their respective base images.
readonly __default_debian_iptables_version=buster-v1.6.2 readonly __default_debian_iptables_version=buster-v1.6.5
readonly __default_go_runner_version=v2.3.1-go1.16.5-buster.0 readonly __default_go_runner_version=v2.3.1-go1.16.5-buster.0
readonly __default_setcap_version=buster-v2.0.1 readonly __default_setcap_version=buster-v2.0.3
# These are the base images for the Docker-wrapped binaries. # 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}" readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"

6
build/dependencies.yaml
View File

@ -130,7 +130,7 @@ dependencies:
# Base images # Base images
- name: "k8s.gcr.io/debian-base: dependents" - name: "k8s.gcr.io/debian-base: dependents"
version: buster-v1.7.1 version: buster-v1.8.0
refPaths: refPaths:
- path: cluster/images/etcd/Makefile - 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-]+)*))?) 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-]+)*))?)
@ -144,7 +144,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-]+)*))?) 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" - name: "k8s.gcr.io/debian-iptables: dependents"
version: buster-v1.6.2 version: buster-v1.6.5
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_debian_iptables_version= match: __default_debian_iptables_version=
@ -216,7 +216,7 @@ dependencies:
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
- name: "k8s.gcr.io/setcap: dependents" - name: "k8s.gcr.io/setcap: dependents"
version: buster-v2.0.1 version: buster-v2.0.3
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_setcap_version= match: __default_setcap_version=

10
cluster/images/etcd/Makefile
View File

@ -67,19 +67,19 @@ GOARM?=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.7.1 BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.8.0
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.7.1 BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.8.0
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.7.1 BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.8.0
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.7.1 BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.8.0
endif endif
ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.7.1 BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.8.0
endif endif
RUNNERIMAGE?=gcr.io/distroless/static:latest RUNNERIMAGE?=gcr.io/distroless/static:latest

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

@ -214,7 +214,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) {
configs[CheckMetadataConcealment] = Config{list.PromoterE2eRegistry, "metadata-concealment", "1.6"} configs[CheckMetadataConcealment] = Config{list.PromoterE2eRegistry, "metadata-concealment", "1.6"}
configs[CudaVectorAdd] = Config{list.E2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd] = Config{list.E2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "buster-v1.6.2"} configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "buster-v1.6.5"}
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.3"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.3"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.4.13-0"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.4.13-0"}
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"}