mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #53642 from edevil/add_kmod
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>. Ensure base image includes the modprobe binary **What this PR does / why we need it**: Includes the kmod package so that "modprobe" is available for kubelet and kube-proxy. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #53396
This commit is contained in:
commit
9af47db908
@ -24,6 +24,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
|
||||
e2fsprogs \
|
||||
ebtables \
|
||||
ethtool \
|
||||
kmod \
|
||||
ca-certificates \
|
||||
conntrack \
|
||||
util-linux \
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
REGISTRY?=gcr.io/google-containers
|
||||
IMAGE?=debian-hyperkube-base
|
||||
TAG=0.3
|
||||
TAG=0.4
|
||||
ARCH?=amd64
|
||||
CACHEBUST?=1
|
||||
|
||||
|
@ -64,10 +64,10 @@ docker_pull(
|
||||
|
||||
docker_pull(
|
||||
name = "debian-hyperkube-base-amd64",
|
||||
digest = "sha256:e45d35f9f967ef7d49496d1d2e6f9ad378a29012b0c90f78b5d59a254f3135e6",
|
||||
digest = "sha256:f3a37c4d8700a5ff454d94a2bef7d165d287759cea737a621c20e4aa3891dbbb",
|
||||
registry = "gcr.io",
|
||||
repository = "google-containers/debian-hyperkube-base-amd64",
|
||||
tag = "0.3", # ignored, but kept here for documentation
|
||||
tag = "0.4", # 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.3
|
||||
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.4
|
||||
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
||||
|
||||
all: build
|
||||
|
Loading…
Reference in New Issue
Block a user