mirror of https://github.com/k3s-io/k3s
Merge pull request #54272 from dixudx/bump_debian-hyperkube-base_due_CNI
Automatic merge from submit-queue. 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>. bump debian-hyperkube-base to 0.5 since CNI gets bumped **What this PR does / why we need it**: xref [discussion](https://github.com/kubernetes/kubernetes/pull/51250#discussion_r145796595) in #51250 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: /assign @ixdy @luxas **Release note**: ```release-note None ```pull/6/head
commit
6f06408eea
|
@ -19,7 +19,7 @@
|
|||
|
||||
REGISTRY?=gcr.io/google-containers
|
||||
IMAGE?=debian-hyperkube-base
|
||||
TAG=0.4
|
||||
TAG=0.5
|
||||
ARCH?=amd64
|
||||
CACHEBUST?=1
|
||||
|
||||
|
|
|
@ -70,10 +70,10 @@ docker_pull(
|
|||
|
||||
docker_pull(
|
||||
name = "debian-hyperkube-base-amd64",
|
||||
digest = "sha256:f3a37c4d8700a5ff454d94a2bef7d165d287759cea737a621c20e4aa3891dbbb",
|
||||
digest = "sha256:d216b425004fcb6d8047f74e81b30e7ead55f73e73511ca53a329c358786b6c9",
|
||||
registry = "gcr.io",
|
||||
repository = "google-containers/debian-hyperkube-base-amd64",
|
||||
tag = "0.4", # ignored, but kept here for documentation
|
||||
tag = "0.5", # ignored, but kept here for documentation
|
||||
)
|
||||
|
||||
docker_pull(
|
||||
|
|
|
@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google-containers
|
|||
ARCH?=amd64
|
||||
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
|
||||
|
||||
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.4
|
||||
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.5
|
||||
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
||||
|
||||
all: build
|
||||
|
|
Loading…
Reference in New Issue