From ee8caaf3e1a7ab648949a7bf036a288ef0516fe4 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Tue, 17 Jan 2017 12:36:30 +0100 Subject: [PATCH] Make CACHEBUST for hyperkube build optional --- cluster/images/hyperkube/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 2244d882d38..6c684977e56 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -21,6 +21,7 @@ REGISTRY?=gcr.io/google_containers ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) CNI_RELEASE=07a8a28637e97b22eb8dfe710eeae1344f69d16e +CACHEBUST?=1 UNAME_S:=$(shell uname -s) ifeq ($(UNAME_S),Darwin) @@ -78,7 +79,9 @@ endif cd ${TEMP_DIR} && sed -i.back "s|ARCH|${ARCH}|g" addons/singlenode/*.yaml addons/multinode/*.yaml static-pods/*.json cd ${TEMP_DIR} && sed -i.back "s|ARCH|${QEMUARCH}|g" Dockerfile cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile +ifeq ($(CACHEBUST),1) cd ${TEMP_DIR} && sed -i.back "s|CACHEBUST|$(shell uuidgen)|g" Dockerfile +endif cd ${TEMP_DIR} && sed -i.back "s|-amd64|-${ARCH}|g" addons/singlenode/*.yaml addons/multinode/*.yaml cd ${TEMP_DIR} && sed -i.back "s|__PILLAR__DNS__SERVER__|10.0.0.10|g" addons/singlenode/kubedns*.yaml addons/multinode/kubedns*.yaml cd ${TEMP_DIR} && sed -i.back "s|__PILLAR__DNS__DOMAIN__|cluster.local|g;s|__PILLAR__FEDERATIONS__DOMAIN__MAP__||g;" addons/singlenode/kubedns*.yaml addons/multinode/kubedns*.yaml