From 1337142df52182888a86e25e7678c0c905688660 Mon Sep 17 00:00:00 2001 From: Patrick Baxter Date: Wed, 24 Aug 2016 22:11:11 +0000 Subject: [PATCH 1/5] cluster/images/hyperkube: add ceph-common --- cluster/images/hyperkube/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile index 81eeb320d482e..6b4646bcc3be5 100644 --- a/cluster/images/hyperkube/Dockerfile +++ b/cluster/images/hyperkube/Dockerfile @@ -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 From 1cef492be976d8da7c449319855674d34dc6c2ca Mon Sep 17 00:00:00 2001 From: Tom Denham Date: Tue, 7 Jun 2016 10:04:56 -0700 Subject: [PATCH 2/5] Add Calico to hyperkube image --- cluster/images/hyperkube/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 0e9840db82757..ce94644d49e8e 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -85,6 +85,8 @@ else 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 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.8.0/calico + chmod +x ${TEMP_DIR}/cni-bin/bin/calico docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR} rm -rf "${TEMP_DIR}" From 059d670d37495e34c0e93793ffa8fc301a9631db Mon Sep 17 00:00:00 2001 From: Patrick Baxter Date: Wed, 14 Jun 2017 23:55:36 +0000 Subject: [PATCH 3/5] cluster/images/hyperkube: bump calico-cni to v1.9.1 --- cluster/images/hyperkube/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index ce94644d49e8e..bf7520cdfad53 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -85,7 +85,7 @@ else 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 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.8.0/calico + curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.9.1/calico chmod +x ${TEMP_DIR}/cni-bin/bin/calico docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR} From 8660460cfd9b178e4b20d5f7a81008c50cb77f08 Mon Sep 17 00:00:00 2001 From: Lucas Serven Date: Mon, 9 Oct 2017 16:25:30 +0200 Subject: [PATCH 4/5] cluster/images/hyperkube: bump calico-cni to v1.11.0 --- cluster/images/hyperkube/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index bf7520cdfad53..c661d5291fdb3 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -85,7 +85,7 @@ else 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 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.9.1/calico + 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} From 7950a8a195e15aa568eb5e77b6ed32490ba0e95e Mon Sep 17 00:00:00 2001 From: Lucas Serven Date: Tue, 24 Oct 2017 12:30:10 +0200 Subject: [PATCH 5/5] cluster/images/hyperkube: install cni plugins v0.6.0 --- cluster/images/hyperkube/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index c661d5291fdb3..d7056bb7e24f3 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google_containers ARCH?=amd64 OUT_DIR?=_output TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) -CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff +CNI_RELEASE=v0.6.0 CACHEBUST?=1 QEMUVERSION=v2.7.0 @@ -61,7 +61,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 ../../../$(OUT_DIR)/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR} chmod a+rx ${TEMP_DIR}/hyperkube @@ -84,7 +84,8 @@ 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