Skip to content

bugfix: use a fixed version of cni instead of the branch of master #2451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2018
Merged

bugfix: use a fixed version of cni instead of the branch of master #2451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion hack/install/install_cni.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -euo pipefail

CNI_VERSION=v0.7

# keep the first one only
GOPATH="${GOPATH%%:*}"

Expand All @@ -20,7 +22,14 @@ cni::install_cni() {
workdir="${GOPATH}/src/${pkg}"

# downloads github.com/containernetworking/plugins
go get -u -d "${pkg}"/...
if [ ! -d "${workdir}" ]; then
Copy link
Contributor

@mathspanda mathspanda Nov 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If fix cni version, we can just download releases from https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz

Copy link
Contributor Author

@starnop starnop Nov 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, the size of the source code package is smaller than the size of the .tgz. In addition, we will be freedom to operate the branch . So no need to change it, IMO. WDYT? Anyway, thanks for your advice. :)

mkdir -p "${workdir}"
cd "${workdir}"
git clone https://${pkg}.git .
fi
cd "${workdir}"
git fetch --all
git checkout "${CNI_VERSION}"

# build and copy into /opt/cni/bin
"${workdir}"/build.sh
Expand Down