From 143af9b67fc8bdc4453889eede8a16d4d6ecdaed Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Sun, 10 Jan 2021 18:03:27 -0600 Subject: [PATCH] cni: bump CNI version to v0.9.0 https://github.com/containernetworking/plugins/releases/tag/v0.9.0 Also make the copy-paste install instructions work with arm64 for a better OOTB experience (AWS Graviton, Pi 4's). --- e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh | 2 +- website/content/docs/drivers/external/containerd.mdx | 2 +- website/content/docs/integrations/consul-connect.mdx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh b/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh index 048ed21ae..a20ba5a88 100755 --- a/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh +++ b/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh @@ -108,7 +108,7 @@ sudo apt-get install -y openjdk-8-jdk echo "Installing CNI plugins" sudo mkdir -p /opt/cni/bin wget -q -O - \ - https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz \ + https://github.com/containernetworking/plugins/releases/download/v0.9.0/cni-plugins-linux-amd64-v0.9.0.tgz \ | sudo tar -C /opt/cni/bin -xz echo "Installing Podman" diff --git a/website/content/docs/drivers/external/containerd.mdx b/website/content/docs/drivers/external/containerd.mdx index 17b5d9de6..f4bf23e9e 100644 --- a/website/content/docs/drivers/external/containerd.mdx +++ b/website/content/docs/drivers/external/containerd.mdx @@ -253,7 +253,7 @@ before you can use `bridge` networks. **Instructions for installing CNI plugins.** ```hcl - $ curl -L -o cni-plugins.tgz https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/releases/download/v0.9.0/cni-plugins-linux-$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)"-v0.9.0.tgz $ sudo mkdir -p /opt/cni/bin $ sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` diff --git a/website/content/docs/integrations/consul-connect.mdx b/website/content/docs/integrations/consul-connect.mdx index 4fe18b43a..eb9da4268 100644 --- a/website/content/docs/integrations/consul-connect.mdx +++ b/website/content/docs/integrations/consul-connect.mdx @@ -116,7 +116,7 @@ must have CNI plugins installed. The following commands install CNI plugins: ```shell-session -$ curl -L -o cni-plugins.tgz https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz +$ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/releases/download/v0.9.0/cni-plugins-linux-$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)"-v0.9.0.tgz $ sudo mkdir -p /opt/cni/bin $ sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ```