From 89972866d3efc11774c91c3b40505a234a136d8d Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Thu, 14 May 2020 09:29:11 -0400 Subject: [PATCH] e2e: upgrade CNI to 0.8.6 (#7956) --- e2e/terraform/shared/config/provision-client.sh | 2 +- e2e/terraform/shared/config/provision-windows-client.ps1 | 2 +- scripts/vagrant-linux-priv-cni.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/terraform/shared/config/provision-client.sh b/e2e/terraform/shared/config/provision-client.sh index 334e5d7a0..6afdde208 100755 --- a/e2e/terraform/shared/config/provision-client.sh +++ b/e2e/terraform/shared/config/provision-client.sh @@ -49,7 +49,7 @@ sudo mkdir -p /tmp/data # Install CNI plugins sudo mkdir -p /opt/cni/bin wget -q -O - \ - https://github.com/containernetworking/plugins/releases/download/v0.8.4/cni-plugins-linux-amd64-v0.8.4.tgz \ + https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz \ | sudo tar -C /opt/cni/bin -xz # enable as a systemd service diff --git a/e2e/terraform/shared/config/provision-windows-client.ps1 b/e2e/terraform/shared/config/provision-windows-client.ps1 index 0dc2f7d1c..2b7657b1d 100755 --- a/e2e/terraform/shared/config/provision-windows-client.ps1 +++ b/e2e/terraform/shared/config/provision-windows-client.ps1 @@ -36,7 +36,7 @@ New-Item -ItemType "directory" -Path "C:\tmp\data" -Force # TODO(tgross): not sure we even support this for Windows? # Write-Output "Install CNI" # md C:\opt\cni\bin -# $cni_url = "https://github.com/containernetworking/plugins/releases/download/v0.8.4/cni-plugins-windows-amd64-v0.8.4.tgz" +# $cni_url = "https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-windows-amd64-v0.8.6.tgz" # Invoke-WebRequest -Uri "$cni_url" -Outfile cni.tgz # Expand-7Zip -ArchiveFileName .\cni.tgz -TargetPath C:\opt\cni\bin\ -Force diff --git a/scripts/vagrant-linux-priv-cni.sh b/scripts/vagrant-linux-priv-cni.sh index bfc9bc0bf..b810ad3ad 100755 --- a/scripts/vagrant-linux-priv-cni.sh +++ b/scripts/vagrant-linux-priv-cni.sh @@ -2,7 +2,7 @@ set -o errexit -VERSION="v0.8.4" +VERSION="v0.8.6" DOWNLOAD=https://github.com/containernetworking/plugins/releases/download/${VERSION}/cni-plugins-linux-amd64-${VERSION}.tgz TARGET_DIR=/opt/cni/bin