github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

clean up install-cni and install-critools

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown 2021-03-09 10:16:05 -06:00
parent 1b1bb48709
commit 2205da64a6
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -345,18 +345,17 @@ uninstall:
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES))) @rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES)))
#TODO(mikebrow): refactor install-critools and install-cni to work for local host and for release
ifeq ($(GOOS),windows) ifeq ($(GOOS),windows)
install-deps: install-deps:
script/setup/install-runc script/setup/install-runc
#script/setup/install-critools script/setup/install-critools
#script/setup/install-cni-windows script/setup/install-cni-windows
else else
install-deps: ## install cri dependencies install-deps: ## install cri dependencies
script/setup/install-seccomp script/setup/install-seccomp
script/setup/install-runc script/setup/install-runc
#script/setup/install-critools script/setup/install-critools
#script/setup/install-cni script/setup/install-cni
endif endif
coverage: ## generate coverprofiles from the unit tests, except tests that require root coverage: ## generate coverprofiles from the unit tests, except tests that require root

8
script/setup/install-cni
View File

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

9
script/setup/install-critools
View File

@ -24,11 +24,16 @@ cd "$GOPATH"
go get -u github.com/onsi/ginkgo/ginkgo go get -u github.com/onsi/ginkgo/ginkgo
CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627 CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
git clone https://github.com/kubernetes-sigs/cri-tools.git "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools TMPROOT=$(mktemp -d)
cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools git clone https://github.com/kubernetes-sigs/cri-tools.git "${TMPROOT}"/cri-tools
pushd "${TMPROOT}"/cri-tools
git checkout "$CRITEST_COMMIT" git checkout "$CRITEST_COMMIT"
make make
make install -e BINDIR=${DESTDIR:=''}/usr/local/bin make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
cat << EOF | tee ${DESTDIR}/etc/crictl.yaml cat << EOF | tee ${DESTDIR}/etc/crictl.yaml
runtime-endpoint: unix:///run/containerd/containerd.sock runtime-endpoint: unix:///run/containerd/containerd.sock
EOF EOF
popd
rm -fR "${TMPROOT}"