mirror of https://github.com/k3s-io/k3s
Merge pull request #61357 from rphillips/fixes/add_udev_to_hyperkube
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 ```pull/8/head
commit
ee99895645
|
@ -40,6 +40,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
|
|||
openssh-client \
|
||||
nfs-common \
|
||||
socat \
|
||||
udev \
|
||||
util-linux
|
||||
|
||||
COPY cni-bin/bin /opt/cni/bin
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
REGISTRY?=staging-k8s.gcr.io
|
||||
IMAGE?=debian-hyperkube-base
|
||||
TAG=0.9
|
||||
TAG=0.10
|
||||
ARCH?=amd64
|
||||
CACHEBUST?=1
|
||||
|
||||
|
|
|
@ -67,10 +67,10 @@ docker_pull(
|
|||
|
||||
docker_pull(
|
||||
name = "debian-hyperkube-base-amd64",
|
||||
digest = "sha256:d83594ecd85345144584523e7fa5388467edf5d2dfa30d0a1bcbf184cddf4a7b",
|
||||
digest = "sha256:cc782ed16599000ca4c85d47ec6264753747ae1e77520894dca84b104a7621e2",
|
||||
registry = "k8s.gcr.io",
|
||||
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(
|
||||
|
|
|
@ -22,7 +22,7 @@ ARCH?=amd64
|
|||
OUT_DIR?=_output
|
||||
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)
|
||||
|
||||
all: build
|
||||
|
|
Loading…
Reference in New Issue