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

V1.7.9 patchset #174

Merged
merged 5 commits into from
Oct 24, 2017
Merged

V1.7.9 patchset #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe5fdb4
cluster/images/hyperkube: add ceph-common
Aug 24, 2016
05572b5
Add Calico to hyperkube image
tomdee Jun 7, 2016
93c75ba
cluster/images/hyperkube: bump calico-cni to v1.9.1
Jun 14, 2017
bcb0853
cluster/images/hyperkube: bump calico-cni to v1.11.0
squat Oct 9, 2017
bca2396
cluster/images/hyperkube: install cni plugins v0.6.0
squat Oct 24, 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 cluster/images/hyperkube/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
nfs-common \
glusterfs-client \
cifs-utils \
ceph-common \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # CACHEBUST
Expand Down
9 changes: 6 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,7 +20,7 @@
REGISTRY?=gcr.io/google_containers
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
CNI_RELEASE=v0.6.0
CACHEBUST?=1
QEMUVERSION=v2.7.0

Expand Down Expand Up @@ -60,7 +60,7 @@ ifndef VERSION
$(error VERSION is undefined)
endif
cp -r ./* ${TEMP_DIR}
mkdir -p ${TEMP_DIR}/cni-bin
mkdir -p ${TEMP_DIR}/cni-bin/bin

cp ../../../_output/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR}
chmod a+rx ${TEMP_DIR}/hyperkube
Expand All @@ -83,7 +83,10 @@ else
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/$(QEMUVERSION)/x86_64_qemu-${QEMUARCH}-static.tar.gz | tar -xz -C ${TEMP_DIR}
endif
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-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/v1.11.0/calico
chmod +x ${TEMP_DIR}/cni-bin/bin/calico

docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"
Expand Down