From 65df8db2896e6a9f4352bc65bedb4a580b057a66 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Fri, 25 Sep 2020 13:09:04 -0700
Subject: [PATCH] Remove sudo from installation and cri release

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .github/workflows/ci.yml      |  4 ++--
 Makefile                      | 24 ++++++++++++------------
 script/setup/install-cni      |  8 ++++----
 script/setup/install-critools |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1256de73..244106a03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -354,8 +354,8 @@ jobs:
         run: |
           sudo PATH=$PATH script/setup/install-seccomp
           gosu root script/setup/install-runc
-          script/setup/install-cni
-          script/setup/install-critools
+          gosu root script/setup/install-cni
+          gosu root script/setup/install-critools
         working-directory: src/github.com/containerd/containerd
 
       - name: Install criu
diff --git a/Makefile b/Makefile
index c80586fcf..adac53e86 100644
--- a/Makefile
+++ b/Makefile
@@ -261,21 +261,21 @@ install-cri-deps: $(BINARIES)
 	cp bin/* $(CRIDIR)
 else
 install-cri-deps: $(BINARIES)
-	@sudo rm -rf ${CRIDIR}
-	@sudo install -d ${CRIDIR}/usr/local/bin
-	@sudo install -D -m 755 bin/* ${CRIDIR}/usr/local/bin
-	@sudo install -d ${CRIDIR}/opt/containerd/cluster
-	@sudo cp -r contrib/gce ${CRIDIR}/opt/containerd/cluster/
-	@sudo install -d ${CRIDIR}/etc/systemd/system
-	@sudo install -m 644 containerd.service ${CRIDIR}/etc/systemd/system
-	echo "CONTAINERD_VERSION: '$(VERSION:v%=%)'" | sudo tee ${CRIDIR}/opt/containerd/cluster/version
+	@rm -rf ${CRIDIR}
+	@install -d ${CRIDIR}/usr/local/bin
+	@install -D -m 755 bin/* ${CRIDIR}/usr/local/bin
+	@install -d ${CRIDIR}/opt/containerd/cluster
+	@cp -r contrib/gce ${CRIDIR}/opt/containerd/cluster/
+	@install -d ${CRIDIR}/etc/systemd/system
+	@install -m 644 containerd.service ${CRIDIR}/etc/systemd/system
+	echo "CONTAINERD_VERSION: '$(VERSION:v%=%)'" | tee ${CRIDIR}/opt/containerd/cluster/version
 
-	DESTDIR=$(CRIDIR) USESUDO=true script/setup/install-runc
+	DESTDIR=$(CRIDIR) USESUDO=false script/setup/install-runc
 	DESTDIR=$(CRIDIR) script/setup/install-cni
 	DESTDIR=$(CRIDIR) script/setup/install-critools
 
-	@sudo install -d $(CRIDIR)/bin
-	@sudo install $(BINARIES) $(CRIDIR)/bin
+	@install -d $(CRIDIR)/bin
+	@install $(BINARIES) $(CRIDIR)/bin
 endif
 
 ifeq ($(GOOS),windows)
@@ -308,7 +308,7 @@ clean: ## clean up binaries
 	@echo "$(WHALE) $@"
 	@rm -f $(BINARIES)
 	@rm -f releases/*.tar.gz*
-	@if [[ -d $(OUTPUTDIR) ]]; then sudo rm -rf $(OUTPUTDIR); fi
+	@rm -rf $(OUTPUTDIR)
 
 clean-test: ## clean up debris from previously failed tests
 	@echo "$(WHALE) $@"
diff --git a/script/setup/install-cni b/script/setup/install-cni
index 58062f9a5..c9cf02793 100755
--- a/script/setup/install-cni
+++ b/script/setup/install-cni
@@ -29,10 +29,10 @@ go get -d github.com/containernetworking/plugins/...
 cd "$GOPATH"/src/github.com/containernetworking/plugins
 git checkout $CNI_COMMIT
 ./build_linux.sh
-sudo mkdir -p $CNI_DIR
-sudo cp -r ./bin $CNI_DIR
-sudo mkdir -p $CNI_CONFIG_DIR
-cat << EOF | sudo tee $CNI_CONFIG_DIR/10-containerd-net.conflist
+mkdir -p $CNI_DIR
+cp -r ./bin $CNI_DIR
+mkdir -p $CNI_CONFIG_DIR
+cat << EOF | tee $CNI_CONFIG_DIR/10-containerd-net.conflist
 {
   "cniVersion": "0.4.0",
   "name": "containerd-net",
diff --git a/script/setup/install-critools b/script/setup/install-critools
index 8f163f8a6..3f08e8348 100755
--- a/script/setup/install-critools
+++ b/script/setup/install-critools
@@ -26,7 +26,7 @@ go get -d github.com/kubernetes-sigs/cri-tools/...
 cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
 git checkout $CRITEST_COMMIT
 make
-sudo make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
-cat << EOF | sudo tee ${DESTDIR}/etc/crictl.yaml
+make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
+cat << EOF | tee ${DESTDIR}/etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF