Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

V1.8.2 patchset #175

Merged
merged 4 commits into from
Oct 25, 2017
Merged

V1.8.2 patchset #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
517e25c
cluster/images/hyperkube: Add the Calico binary
squat Jun 14, 2017
df91fa6
cluster/images/hyperkube: bump Calico to v1.11.0
squat Sep 25, 2017
5b77960
cluster/images/hyperkube: install cni plugins v0.6.0
squat Oct 25, 2017
4d02122
Ensure base image includes the modprobe binary
edevil Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/debian-hyperkube-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
e2fsprogs \
ebtables \
ethtool \
kmod \
ca-certificates \
conntrack \
util-linux \
Expand Down
2 changes: 1 addition & 1 deletion build/debian-hyperkube-base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

REGISTRY?=gcr.io/google-containers
IMAGE?=debian-hyperkube-base
TAG=0.3
TAG=0.4
ARCH?=amd64
CACHEBUST?=1

Expand Down
3 changes: 3 additions & 0 deletions cluster/images/hyperkube/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

FROM BASEIMAGE

# Copy CNI binaries
COPY cni-bin/bin/ /opt/cni/bin

# Create symlinks for each hyperkube server
# Also create symlinks to /usr/local/bin/ where the server image binaries live, so the hyperkube image may be
# used instead of gcr.io/google_containers/kube-* without any modifications.
Expand Down
15 changes: 12 additions & 3 deletions cluster/images/hyperkube/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
REGISTRY?=gcr.io/google-containers
ARCH?=amd64
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
CALICO_RELEASE=v1.11.0
CNI_RELEASE=v0.6.0

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

build:
build: cni

ifndef VERSION
$(error VERSION is undefined)
Expand All @@ -51,4 +53,11 @@ ifeq ($(ARCH),amd64)
gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
endif

.PHONY: build push all
cni:
mkdir -p ${TEMP_DIR}/cni-bin/bin
curl -sSL --retry 5 https://github.com/containernetworking/cni/releases/download/${CNI_RELEASE}/cni-${ARCH}-${CNI_RELEASE}.tgz | tar -xz -C ${TEMP_DIR}/cni-bin/bin
curl -sSL --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_RELEASE}/cni-plugins-${ARCH}-${CNI_RELEASE}.tgz | tar -xz -C ${TEMP_DIR}/cni-bin/bin
curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/${CALICO_RELEASE}/calico
chmod +x ${TEMP_DIR}/cni-bin/bin/calico

.PHONY: build push all cni