From d1f0ac92c5d1c9273a56ca8059e851a6162a60a9 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Mon, 25 Sep 2017 23:43:32 +0000
Subject: [PATCH] Do not include CNI binaries/configs in release tarball.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 hack/install-deps.sh | 64 +++++++++++++++++++++++++-------------------
 hack/release.sh      |  2 +-
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/hack/install-deps.sh b/hack/install-deps.sh
index c3032717c..676c0daee 100755
--- a/hack/install-deps.sh
+++ b/hack/install-deps.sh
@@ -44,6 +44,12 @@ if ${NOSUDO}; then
   sudo=""
 fi
 
+# INSTALL_CNI indicates whether to install CNI. CNI installation
+# makes sense for local testing, but doesn't make sense for cluster
+# setup, because CNI daemonset is usually used to deploy CNI binaries
+# and configurations in cluster.
+INSTALL_CNI=${INSTALL_CNI:-true}
+
 CONTAINERD_DIR=${DESTDIR}/usr/local
 RUNC_DIR=${DESTDIR}
 CNI_DIR=${DESTDIR}/opt/cni
@@ -88,37 +94,39 @@ make BUILDTAGS="$BUILDTAGS"
 ${sudo} make install -e DESTDIR=${RUNC_DIR}
 
 # Install cni
-checkout_repo ${CNI_PKG} ${CNI_VERSION}
-cd ${GOPATH}/src/${CNI_PKG}
-./build.sh
-${sudo} mkdir -p ${CNI_DIR}
-${sudo} cp -r ./bin ${CNI_DIR}
-${sudo} mkdir -p ${CNI_CONFIG_DIR}
-${sudo} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
+if ${INSTALL_CNI}; then
+  checkout_repo ${CNI_PKG} ${CNI_VERSION}
+  cd ${GOPATH}/src/${CNI_PKG}
+  ./build.sh
+  ${sudo} mkdir -p ${CNI_DIR}
+  ${sudo} cp -r ./bin ${CNI_DIR}
+  ${sudo} mkdir -p ${CNI_CONFIG_DIR}
+  ${sudo} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
 {
-    "cniVersion": "0.3.1",
-    "name": "containerd-net",
-    "plugins": [
-	{
-	    "type": "bridge",
-	    "bridge": "cni0",
-	    "isGateway": true,
-	    "ipMasq": true,
-	    "ipam": {
-		"type": "host-local",
-		"subnet": "10.88.0.0/16",
-		"routes": [
-		    { "dst": "0.0.0.0/0" }
-		]
-	    }
-	},
-	{
-	    "type": "portmap",
-	    "capabilities": {"portMappings": true}
-	}
-    ]
+  "cniVersion": "0.3.1",
+  "name": "containerd-net",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni0",
+      "isGateway": true,
+      "ipMasq": true,
+      "ipam": {
+        "type": "host-local",
+        "subnet": "10.88.0.0/16",
+        "routes": [
+          { "dst": "0.0.0.0/0" }
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {"portMappings": true}
+    }
+  ]
 }
 EOF'
+fi
 
 # Install containerd
 checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION}
diff --git a/hack/release.sh b/hack/release.sh
index aea03c7b4..108799243 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -29,7 +29,7 @@ TARBALL=${TARBALL:-"cri-containerd.tar.gz"}
 destdir=${BUILD_DIR}/release-stage
 
 # Install dependencies into release stage.
-NOSUDO=true DESTDIR=${destdir} ./hack/install-deps.sh
+NOSUDO=true INSTALL_CNI=false DESTDIR=${destdir} ./hack/install-deps.sh
 
 # Install cri-containerd into release stage.
 make install -e DESTDIR=${destdir}