mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #67365 from ixdy/update-debian-container-images
Automatic merge from submit-queue (batch tested with PRs 67396, 67097, 67395, 67365, 67099). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update to debian-iptables v10.1 and hyperkube-base 0.10.1 **What this PR does / why we need it**: these images are based on the `debian-base` 0.3.2 images, which include CVE fixes (#67026) and permission fixes of the qemu-ARCH-static helper binary (#67026, #67283). **Release note**: ```release-note NONE ```
This commit is contained in:
commit
f6eb545ad3
@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
|||||||
#
|
#
|
||||||
# $1 - server architecture
|
# $1 - server architecture
|
||||||
kube::build::get_docker_wrapped_binaries() {
|
kube::build::get_docker_wrapped_binaries() {
|
||||||
debian_iptables_version=v10
|
debian_iptables_version=v10.1
|
||||||
### If you change any of these lists, please also update DOCKERIZED_BINARIES
|
### If you change any of these lists, please also update DOCKERIZED_BINARIES
|
||||||
### in build/BUILD.
|
### in build/BUILD.
|
||||||
case $1 in
|
case $1 in
|
||||||
|
@ -67,18 +67,18 @@ http_file(
|
|||||||
|
|
||||||
docker_pull(
|
docker_pull(
|
||||||
name = "debian-iptables-amd64",
|
name = "debian-iptables-amd64",
|
||||||
digest = "sha256:fb18678f8203ca1bd2fad2671e3ebd80cb408a1baae423d4ad39c05f4caac4e1",
|
digest = "sha256:58e53e477d204fe32f761ec2718b792f653063d4192ae89efc79e4b6a8dbba91",
|
||||||
registry = "k8s.gcr.io",
|
registry = "k8s.gcr.io",
|
||||||
repository = "debian-iptables-amd64",
|
repository = "debian-iptables-amd64",
|
||||||
tag = "v10", # ignored, but kept here for documentation
|
tag = "v10.1", # ignored, but kept here for documentation
|
||||||
)
|
)
|
||||||
|
|
||||||
docker_pull(
|
docker_pull(
|
||||||
name = "debian-hyperkube-base-amd64",
|
name = "debian-hyperkube-base-amd64",
|
||||||
digest = "sha256:cc782ed16599000ca4c85d47ec6264753747ae1e77520894dca84b104a7621e2",
|
digest = "sha256:1c83ca9c8ac4a06e4585802edf8a1cd954011152409116e9c801f4736b97b956",
|
||||||
registry = "k8s.gcr.io",
|
registry = "k8s.gcr.io",
|
||||||
repository = "debian-hyperkube-base-amd64",
|
repository = "debian-hyperkube-base-amd64",
|
||||||
tag = "0.10", # ignored, but kept here for documentation
|
tag = "0.10.1", # ignored, but kept here for documentation
|
||||||
)
|
)
|
||||||
|
|
||||||
docker_pull(
|
docker_pull(
|
||||||
|
@ -22,7 +22,7 @@ ARCH?=amd64
|
|||||||
OUT_DIR?=_output
|
OUT_DIR?=_output
|
||||||
HYPERKUBE_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube
|
HYPERKUBE_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube
|
||||||
|
|
||||||
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.10
|
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.10.1
|
||||||
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
Loading…
Reference in New Issue
Block a user