script/setup: use git clone instead of go get -d

thaJeztah · thaJeztah · commit fca4a0d1b2e0 · 2021-03-17T10:57:04.000+01:00
`go get -d` uses go modules by default in Go 1.16 and up, which results in modules being fetched for the "latest" module version, after which we tried to "git checkout" to `<VERSION>`. For runc, this means that (possibly incorrectly), `go get` will download runc `v0.1.1` (most recent non-"pre-release", which caused failures (e.g the old `Sirupsen/logrus` being downloaded). In addition, some of the dependencies we're installing use vendoring, and thus would not require the modules to be downloaded (and vendored files will be ignored when using `go get` with modules). This patch switches several uses `go get -d` to use a regular git clone, after which the desired version is checked out, and the binaries are built. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: Phil Estes <estesp@amazon.com> (cherry picked from commit 1645738) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/script/setup/install-cni b/script/setup/install-cni
@@ -25,7 +25,7 @@ CNI_COMMIT=$(grep containernetworking/plugins "$GOPATH"/src/github.com/container
 CNI_DIR=${DESTDIR:=''}/opt/cni
 CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
 
-go get -d github.com/containernetworking/plugins/...
+git clone https://github.com/containernetworking/plugins.git "$GOPATH"/src/github.com/containernetworking/plugins
 cd "$GOPATH"/src/github.com/containernetworking/plugins
 git checkout $CNI_COMMIT
 ./build_linux.sh
diff --git a/script/setup/install-cni-windows b/script/setup/install-cni-windows
@@ -21,7 +21,7 @@ WINCNI_BIN_DIR="${DESTDIR}/cni"
 WINCNI_PKG=github.com/Microsoft/windows-container-networking
 WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2
 
-go get -d "${WINCNI_PKG}/..."
+git clone "https://${WINCNI_PKG}.git" "${GOPATH}/src/${WINCNI_PKG}"
 cd "${GOPATH}/src/${WINCNI_PKG}"
 git checkout "${WINCNI_VERSION}"
 make all
diff --git a/script/setup/install-critools b/script/setup/install-critools
@@ -22,9 +22,9 @@ set -eu -o pipefail
 
 go get -u github.com/onsi/ginkgo/ginkgo
 CRITEST_COMMIT=2bf7674922a424337d7580a08166d666c6802818 # v1.18.0-100-g2bf7674
-go get -d github.com/kubernetes-sigs/cri-tools/...
+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
-git checkout $CRITEST_COMMIT
+git checkout "$CRITEST_COMMIT"
 make
 sudo make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
 cat << EOF | sudo tee ${DESTDIR}/etc/crictl.yaml
diff --git a/script/setup/install-runc b/script/setup/install-runc
@@ -23,9 +23,10 @@ set -eu -o pipefail
 function install_runc() {
 	RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/vendor.conf | awk '{print $2}')
 
-	go get -d github.com/opencontainers/runc
-	cd "$GOPATH"/src/github.com/opencontainers/runc
-	git checkout $RUNC_COMMIT
+	TMPROOT=$(mktemp -d)
+	git clone https://github.com/opencontainers/runc.git "${TMPROOT}"/runc
+	pushd "${TMPROOT}"/runc
+	git checkout "${RUNC_COMMIT}"
 	make BUILDTAGS='apparmor seccomp selinux' runc
 
 	USESUDO=${USESUDO:-false}
@@ -35,6 +36,8 @@ function install_runc() {
 	  SUDO=''
 	fi
 	${SUDO} make install
+	popd
+	rm -fR "${TMPROOT}"
 }
 
 function install_crun() {
@@ -43,7 +46,7 @@ function install_crun() {
 	chmod +x /usr/local/sbin/runc
 }
 
-: ${RUNC_FLAVOR:=runc}
+: "${RUNC_FLAVOR:=runc}"
 case ${RUNC_FLAVOR} in
 runc) install_runc ;;
 crun) install_crun ;;
