Merge pull request #5132 from mikebrow/add-some-debug-out-for-dep-setups

adds a new install-deps in the makefile; and some refactoring of the scripts

script/setup/critools-version

@@ -0,0 +1 @@
+0f5f734a7e1da0979915c6e7d5b6641bd9dc2627

script/setup/install-cni

@@ -25,8 +25,9 @@ CNI_COMMIT=$(grep containernetworking/plugins "$GOPATH"/src/github.com/container
 CNI_DIR=${DESTDIR:=''}/opt/cni
 CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
 
-git clone https://github.com/containernetworking/plugins.git "$GOPATH"/src/github.com/containernetworking/plugins
-cd "$GOPATH"/src/github.com/containernetworking/plugins
+TMPROOT=$(mktemp -d)
+git clone https://github.com/containernetworking/plugins.git "${TMPROOT}"/plugins
+pushd "${TMPROOT}"/plugins
 git checkout $CNI_COMMIT
 ./build_linux.sh
 mkdir -p $CNI_DIR
@@ -66,3 +67,6 @@ cat << EOF | tee $CNI_CONFIG_DIR/10-containerd-net.conflist
   ]
 }
 EOF
+
+popd
+rm -fR "${TMPROOT}"

script/setup/install-critools

@@ -20,15 +20,23 @@
 #
 set -eu -o pipefail
 
+script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"
+
 cd "$GOPATH"
 go get -u github.com/onsi/ginkgo/ginkgo
-CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
 
-git clone https://github.com/kubernetes-sigs/cri-tools.git "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
-cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
+: "${CRITEST_COMMIT:=$(cat "${script_dir}/critools-version")}"
+
+TMPROOT=$(mktemp -d)
+git clone https://github.com/kubernetes-sigs/cri-tools.git "${TMPROOT}"/cri-tools
+pushd "${TMPROOT}"/cri-tools
 git checkout "$CRITEST_COMMIT"
 make
 make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
+
 cat << EOF | tee ${DESTDIR}/etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
+
+popd
+rm -fR "${TMPROOT}"