github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56094 from ixdy/bump-debian-hyperkube-base-tags 

Automatic merge from submit-queue (batch tested with PRs 56094, 52910, 55953, 56405, 56415). 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 debian-hyperkube-base to 0.7

**What this PR does / why we need it**: this was supposed to be a part of #52744 but was missed in a rebase, I think. Bazel was already using the correct version, but the dockerized releases were not.

**Release note**:

```release-note
NONE
```

/kind bug
/priority important-soon
/assign @rphillips 
/cc @luxas @dims
pull/6/head
Kubernetes Submit Queue 2017-11-27 16:04:19 -08:00 committed by GitHub
parent ca37d42048 055b123978
commit 91ef488f49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/debian-hyperkube-base/Makefile
View File

@ -19,7 +19,7 @@
REGISTRY?=gcr.io/google-containers REGISTRY?=gcr.io/google-containers
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.6 TAG=0.7
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1

2
build/root/WORKSPACE
View File

@ -91,7 +91,7 @@ docker_pull(
digest = "sha256:1a05a58432254268c31ef5c8d9c21f3d01a40611b14707de6ac2772c0793bd13", digest = "sha256:1a05a58432254268c31ef5c8d9c21f3d01a40611b14707de6ac2772c0793bd13",
registry = "gcr.io", registry = "gcr.io",
repository = "google-containers/debian-hyperkube-base-amd64", repository = "google-containers/debian-hyperkube-base-amd64",
tag = "0.6", # ignored, but kept here for documentation tag = "0.7", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(

2
cluster/images/hyperkube/Makefile
View File

@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google-containers
ARCH?=amd64 ARCH?=amd64
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.6 BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.7
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
all: build all: build