github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52798 from rphillips/fixes/restore_e2fsprogs_hyperkube

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 52477, 52790, 52798). 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>..

restore e2fsprogs in hyperkube image

**What this PR does / why we need it**:
Kubernetes defaults to the ext4 filesystem if no filesystem is specified. Unformatted filesystems are not able to be mounted without these tools.

The default ext{2,3,4} tools and mkfs.* utilities should be included in the hyperkube image.

**Which issue this PR fixes**: Fixes #52789 #50802

**Special notes for your reviewer**:

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-20 15:44:06 -07:00 committed by GitHub
commit d83c8bc15d
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ RUN ln -s /bin/sh /bin/bash
RUN echo CACHEBUST>/dev/null && clean-install \ RUN echo CACHEBUST>/dev/null && clean-install \
iptables \ iptables \
e2fsprogs \
ebtables \ ebtables \
ethtool \ ethtool \
ca-certificates \ ca-certificates \

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.2 TAG=0.3
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1

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.2 BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.3
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
all: build all: build