github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-25 11:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61357 from rphillips/fixes/add_udev_to_hyperkube

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 61848, 61188, 56363, 61357, 61838). 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>.

add udev to hyperkube and bump versions

**What this PR does / why we need it**: Adds udev to the hyperkube to fix GCE and OpenStack volume mounts.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #61356 
Fixes #43515
Fixes https://github.com/coreos/bugs/issues/2385

**Special notes for your reviewer**:

/cc @kubernetes/sig-node-bugs @kubernetes/sig-node-pr-reviews 
/cc @ixdy 

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-28 13:52:14 -07:00 committed by GitHub
commit ee99895645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/debian-hyperkube-base/Dockerfile
View File

@ -40,6 +40,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
openssh-client \ openssh-client \
nfs-common \ nfs-common \
socat \ socat \
udev \
util-linux util-linux
COPY cni-bin/bin /opt/cni/bin COPY cni-bin/bin /opt/cni/bin

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

@ -19,7 +19,7 @@
REGISTRY?=staging-k8s.gcr.io REGISTRY?=staging-k8s.gcr.io
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.9 TAG=0.10
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1

4
build/root/WORKSPACE
View File

@ -67,10 +67,10 @@ docker_pull(
docker_pull( docker_pull(
name = "debian-hyperkube-base-amd64", name = "debian-hyperkube-base-amd64",
digest = "sha256:d83594ecd85345144584523e7fa5388467edf5d2dfa30d0a1bcbf184cddf4a7b", digest = "sha256:cc782ed16599000ca4c85d47ec6264753747ae1e77520894dca84b104a7621e2",
registry = "k8s.gcr.io", registry = "k8s.gcr.io",
repository = "debian-hyperkube-base-amd64", repository = "debian-hyperkube-base-amd64",
tag = "0.9", # ignored, but kept here for documentation tag = "0.10", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(

2
cluster/images/hyperkube/Makefile
View File

@ -22,7 +22,7 @@ ARCH?=amd64
OUT_DIR?=_output OUT_DIR?=_output
HYPERKUBE_BIN?=$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube HYPERKUBE_BIN?=$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.8 BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.10
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
all: build all: build