Repository: kubermatic/machine-controller
Pull request #766 (2020-05-25 09:42:53)

bump CNI Plugins to v0.8.6
```release-note
CNI plugins have been upgraded to `v0.8.6`
```


kubermatic-bot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubermatic/machine-controller/pull/766#" title="Author self-approved">kdomanski</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubermatic%2Fmachine-controller).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubermatic/machine-controller/blob/master/OWNERS)~~ [kdomanski]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
kubermatic-bot: LGTM label has been added.  <details>Git tree hash: 50c2054014a6af51389c23c5b64543aa0c335537</details>
kubermatic-bot: New changes are detected. LGTM label has been removed.
kubermatic-bot: LGTM label has been added.  <details>Git tree hash: b5bea0183ecdc4db973a695a42cf09b441a42b83</details>

Patch:
diff --git a/pkg/userdata/helper/download_binaries_script.go b/pkg/userdata/helper/download_binaries_script.go
index 440fff52..c2befe1e 100644
--- a/pkg/userdata/helper/download_binaries_script.go
+++ b/pkg/userdata/helper/download_binaries_script.go
@@ -99,7 +99,7 @@ mkdir -p /opt/cni/bin
 
 {{- /* # cni */}}
 if [ ! -f /opt/cni/bin/loopback ]; then
-    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz | tar -xvzC /opt/cni/bin -f -
+    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar -xvzC /opt/cni/bin -f -
 fi
 
 {{- if .DownloadKubelet }}
@@ -125,7 +125,7 @@ func SafeDownloadBinariesScript(kubeVersion string) (string, error) {
 		return "", fmt.Errorf("failed to parse download-binaries template: %v", err)
 	}
 
-	const CNIVersion = "v0.8.2"
+	const CNIVersion = "v0.8.6"
 
 	// force v in case if it's not there
 	if !strings.HasPrefix(kubeVersion, "v") {


Test patch:
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.15-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.15-aws.yaml
index 2db8db5e..c9ea408d 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.15-aws.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.15-aws.yaml
@@ -90,7 +90,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.16-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.16-aws.yaml
index 6215f4ec..1f26798d 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.16-aws.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.16-aws.yaml
@@ -90,7 +90,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.17-aws-external.yaml b/pkg/userdata/centos/testdata/kubelet-v1.17-aws-external.yaml
index 5fc739f2..20727ba5 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.17-aws-external.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.17-aws-external.yaml
@@ -90,7 +90,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.17-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.17-aws.yaml
index 5c9b21ec..c905ccff 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.17-aws.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.17-aws.yaml
@@ -90,7 +90,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-mirrors.yaml b/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-mirrors.yaml
index 6a6b13e6..b27c20ad 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-mirrors.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-mirrors.yaml
@@ -103,7 +103,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-proxy.yaml b/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-proxy.yaml
index d64c82f0..2c392afa 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-proxy.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-proxy.yaml
@@ -103,7 +103,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere.yaml b/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere.yaml
index 70dbe616..c7abaa9a 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere.yaml
+++ b/pkg/userdata/centos/testdata/kubelet-v1.17-vsphere.yaml
@@ -95,7 +95,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/auto-update-openstack-kubelet-v-version-prefix.yaml b/pkg/userdata/coreos/testdata/auto-update-openstack-kubelet-v-version-prefix.yaml
index 03bb6e70..83336eba 100644
--- a/pkg/userdata/coreos/testdata/auto-update-openstack-kubelet-v-version-prefix.yaml
+++ b/pkg/userdata/coreos/testdata/auto-update-openstack-kubelet-v-version-prefix.yaml
@@ -349,7 +349,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.15.0-vsphere.yaml b/pkg/userdata/coreos/testdata/v1.15.0-vsphere.yaml
index 835884aa..f96f6548 100644
--- a/pkg/userdata/coreos/testdata/v1.15.0-vsphere.yaml
+++ b/pkg/userdata/coreos/testdata/v1.15.0-vsphere.yaml
@@ -346,7 +346,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.16.2-vsphere-static-ipconfig.yaml b/pkg/userdata/coreos/testdata/v1.16.2-vsphere-static-ipconfig.yaml
index 975d7801..1262a2a7 100644
--- a/pkg/userdata/coreos/testdata/v1.16.2-vsphere-static-ipconfig.yaml
+++ b/pkg/userdata/coreos/testdata/v1.16.2-vsphere-static-ipconfig.yaml
@@ -368,7 +368,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.0-vsphere-mirrors.yaml b/pkg/userdata/coreos/testdata/v1.17.0-vsphere-mirrors.yaml
index d95d6a6b..e2b49f1d 100644
--- a/pkg/userdata/coreos/testdata/v1.17.0-vsphere-mirrors.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.0-vsphere-mirrors.yaml
@@ -387,7 +387,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.0-vsphere-overwrite-cloudconfig.yaml b/pkg/userdata/coreos/testdata/v1.17.0-vsphere-overwrite-cloudconfig.yaml
index a6d07aff..2738aa0b 100644
--- a/pkg/userdata/coreos/testdata/v1.17.0-vsphere-overwrite-cloudconfig.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.0-vsphere-overwrite-cloudconfig.yaml
@@ -371,7 +371,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.0-vsphere-proxy.yaml b/pkg/userdata/coreos/testdata/v1.17.0-vsphere-proxy.yaml
index 175eecbc..5cd7506c 100644
--- a/pkg/userdata/coreos/testdata/v1.17.0-vsphere-proxy.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.0-vsphere-proxy.yaml
@@ -387,7 +387,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.0.yaml b/pkg/userdata/coreos/testdata/v1.17.0.yaml
index 6d8fdc6b..ead7ff97 100644
--- a/pkg/userdata/coreos/testdata/v1.17.0.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.0.yaml
@@ -369,7 +369,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws-external.yaml b/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws-external.yaml
index 8c856123..38d8583b 100644
--- a/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws-external.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws-external.yaml
@@ -346,7 +346,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws.yaml b/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws.yaml
index 766ea979..8ed2d393 100644
--- a/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.2-disable-auto-update-aws.yaml
@@ -347,7 +347,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.2-disable-locksmith-aws.yaml b/pkg/userdata/coreos/testdata/v1.17.2-disable-locksmith-aws.yaml
index 27b43fd7..854312c6 100644
--- a/pkg/userdata/coreos/testdata/v1.17.2-disable-locksmith-aws.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.2-disable-locksmith-aws.yaml
@@ -345,7 +345,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.2-disable-update-engine-aws.yaml b/pkg/userdata/coreos/testdata/v1.17.2-disable-update-engine-aws.yaml
index bbb48baf..f6be6340 100644
--- a/pkg/userdata/coreos/testdata/v1.17.2-disable-update-engine-aws.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.2-disable-update-engine-aws.yaml
@@ -345,7 +345,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/coreos/testdata/v1.17.3-auto-update-openstack-multiple-dns.yaml b/pkg/userdata/coreos/testdata/v1.17.3-auto-update-openstack-multiple-dns.yaml
index 6c5ff93c..4192dd1c 100644
--- a/pkg/userdata/coreos/testdata/v1.17.3-auto-update-openstack-multiple-dns.yaml
+++ b/pkg/userdata/coreos/testdata/v1.17.3-auto-update-openstack-multiple-dns.yaml
@@ -351,7 +351,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/flatcar/testdata/v1.17.0.yaml b/pkg/userdata/flatcar/testdata/v1.17.0.yaml
index 9f19e953..b9839ff7 100644
--- a/pkg/userdata/flatcar/testdata/v1.17.0.yaml
+++ b/pkg/userdata/flatcar/testdata/v1.17.0.yaml
@@ -369,7 +369,7 @@ storage:
           cni_bin_dir=/opt/cni/bin
           mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
           arch=${HOST_ARCH:-amd64}
-          CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+          CNI_VERSION="${CNI_VERSION:-v0.8.6}"
           cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
           cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
           curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/helper/testdata/download_binaries_v1.10.0.golden b/pkg/userdata/helper/testdata/download_binaries_v1.10.0.golden
index 3bd396c9..438e56c4 100644
--- a/pkg/userdata/helper/testdata/download_binaries_v1.10.0.golden
+++ b/pkg/userdata/helper/testdata/download_binaries_v1.10.0.golden
@@ -4,7 +4,7 @@ mkdir -p /etc/kubernetes/manifests
 mkdir -p /etc/cni/net.d
 mkdir -p /opt/cni/bin
 if [ ! -f /opt/cni/bin/loopback ]; then
-    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz | tar -xvzC /opt/cni/bin -f -
+    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar -xvzC /opt/cni/bin -f -
 fi
 if [ ! -f /opt/bin/kubelet ]; then
     curl -Lfo /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubelet
diff --git a/pkg/userdata/helper/testdata/download_binaries_v1.11.0-rc.2.golden b/pkg/userdata/helper/testdata/download_binaries_v1.11.0-rc.2.golden
index e6689a5d..df95c1cb 100644
--- a/pkg/userdata/helper/testdata/download_binaries_v1.11.0-rc.2.golden
+++ b/pkg/userdata/helper/testdata/download_binaries_v1.11.0-rc.2.golden
@@ -4,7 +4,7 @@ mkdir -p /etc/kubernetes/manifests
 mkdir -p /etc/cni/net.d
 mkdir -p /opt/cni/bin
 if [ ! -f /opt/cni/bin/loopback ]; then
-    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz | tar -xvzC /opt/cni/bin -f -
+    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar -xvzC /opt/cni/bin -f -
 fi
 if [ ! -f /opt/bin/kubelet ]; then
     curl -Lfo /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.11.0-rc.2/bin/linux/amd64/kubelet
diff --git a/pkg/userdata/helper/testdata/download_binaries_v1.11.0.golden b/pkg/userdata/helper/testdata/download_binaries_v1.11.0.golden
index ad12fdc9..3a79c1c4 100644
--- a/pkg/userdata/helper/testdata/download_binaries_v1.11.0.golden
+++ b/pkg/userdata/helper/testdata/download_binaries_v1.11.0.golden
@@ -4,7 +4,7 @@ mkdir -p /etc/kubernetes/manifests
 mkdir -p /etc/cni/net.d
 mkdir -p /opt/cni/bin
 if [ ! -f /opt/cni/bin/loopback ]; then
-    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz | tar -xvzC /opt/cni/bin -f -
+    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar -xvzC /opt/cni/bin -f -
 fi
 if [ ! -f /opt/bin/kubelet ]; then
     curl -Lfo /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/amd64/kubelet
diff --git a/pkg/userdata/helper/testdata/download_binaries_v1.11.3.golden b/pkg/userdata/helper/testdata/download_binaries_v1.11.3.golden
index 63dcb7a2..65fd6c30 100644
--- a/pkg/userdata/helper/testdata/download_binaries_v1.11.3.golden
+++ b/pkg/userdata/helper/testdata/download_binaries_v1.11.3.golden
@@ -4,7 +4,7 @@ mkdir -p /etc/kubernetes/manifests
 mkdir -p /etc/cni/net.d
 mkdir -p /opt/cni/bin
 if [ ! -f /opt/cni/bin/loopback ]; then
-    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz | tar -xvzC /opt/cni/bin -f -
+    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar -xvzC /opt/cni/bin -f -
 fi
 if [ ! -f /opt/bin/kubelet ]; then
     curl -Lfo /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/linux/amd64/kubelet
diff --git a/pkg/userdata/helper/testdata/download_binaries_v1.12.0.golden b/pkg/userdata/helper/testdata/download_binaries_v1.12.0.golden
index 293ae9a8..d8602524 100644
--- a/pkg/userdata/helper/testdata/download_binaries_v1.12.0.golden
+++ b/pkg/userdata/helper/testdata/download_binaries_v1.12.0.golden
@@ -4,7 +4,7 @@ mkdir -p /etc/kubernetes/manifests
 mkdir -p /etc/cni/net.d
 mkdir -p /opt/cni/bin
 if [ ! -f /opt/cni/bin/loopback ]; then
-    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz | tar -xvzC /opt/cni/bin -f -
+    curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar -xvzC /opt/cni/bin -f -
 fi
 if [ ! -f /opt/bin/kubelet ]; then
     curl -Lfo /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubelet
diff --git a/pkg/userdata/helper/testdata/safe_download_binaries_v1.18.2.golden b/pkg/userdata/helper/testdata/safe_download_binaries_v1.18.2.golden
index 310e6512..12944093 100644
--- a/pkg/userdata/helper/testdata/safe_download_binaries_v1.18.2.golden
+++ b/pkg/userdata/helper/testdata/safe_download_binaries_v1.18.2.golden
@@ -2,7 +2,7 @@ opt_bin=/opt/bin
 cni_bin_dir=/opt/cni/bin
 mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
 arch=${HOST_ARCH:-amd64}
-CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+CNI_VERSION="${CNI_VERSION:-v0.8.6}"
 cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
 cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
 curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.15-aws.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.15-aws.yaml
index 45ba3565..95c5560b 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.15-aws.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.15-aws.yaml
@@ -94,7 +94,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.16-aws.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.16-aws.yaml
index a6cdbfdc..04991709 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.16-aws.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.16-aws.yaml
@@ -94,7 +94,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.17-aws-external.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.17-aws-external.yaml
index 8a7b573d..24ffb6d4 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.17-aws-external.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.17-aws-external.yaml
@@ -94,7 +94,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.17-aws.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.17-aws.yaml
index 6e932089..c7796766 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.17-aws.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.17-aws.yaml
@@ -94,7 +94,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-mirrors.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-mirrors.yaml
index 93ea7278..b9b85b32 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-mirrors.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-mirrors.yaml
@@ -107,7 +107,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-proxy.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-proxy.yaml
index b85855a9..be89fe57 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-proxy.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere-proxy.yaml
@@ -107,7 +107,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere.yaml
index bac3c948..ee2e0d86 100644
--- a/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere.yaml
+++ b/pkg/userdata/rhel/testdata/kubelet-v1.17-vsphere.yaml
@@ -99,7 +99,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/dist-upgrade-on-boot.yaml b/pkg/userdata/sles/testdata/dist-upgrade-on-boot.yaml
index 7692062d..4ad0f538 100644
--- a/pkg/userdata/sles/testdata/dist-upgrade-on-boot.yaml
+++ b/pkg/userdata/sles/testdata/dist-upgrade-on-boot.yaml
@@ -69,7 +69,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/kubelet-version-without-v-prefix.yaml b/pkg/userdata/sles/testdata/kubelet-version-without-v-prefix.yaml
index fc9512f0..9e01ca29 100644
--- a/pkg/userdata/sles/testdata/kubelet-version-without-v-prefix.yaml
+++ b/pkg/userdata/sles/testdata/kubelet-version-without-v-prefix.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/multiple-dns-servers.yaml b/pkg/userdata/sles/testdata/multiple-dns-servers.yaml
index 48480f64..8d1a2d6d 100644
--- a/pkg/userdata/sles/testdata/multiple-dns-servers.yaml
+++ b/pkg/userdata/sles/testdata/multiple-dns-servers.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/multiple-ssh-keys.yaml b/pkg/userdata/sles/testdata/multiple-ssh-keys.yaml
index 90fa39e9..6bd6da10 100644
--- a/pkg/userdata/sles/testdata/multiple-ssh-keys.yaml
+++ b/pkg/userdata/sles/testdata/multiple-ssh-keys.yaml
@@ -69,7 +69,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/openstack-overwrite-cloud-config.yaml b/pkg/userdata/sles/testdata/openstack-overwrite-cloud-config.yaml
index 97416ed6..df9500d3 100644
--- a/pkg/userdata/sles/testdata/openstack-overwrite-cloud-config.yaml
+++ b/pkg/userdata/sles/testdata/openstack-overwrite-cloud-config.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/openstack.yaml b/pkg/userdata/sles/testdata/openstack.yaml
index b2c18f56..f6e51344 100644
--- a/pkg/userdata/sles/testdata/openstack.yaml
+++ b/pkg/userdata/sles/testdata/openstack.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/version-1.15.10.yaml b/pkg/userdata/sles/testdata/version-1.15.10.yaml
index c3f8e377..7411305c 100644
--- a/pkg/userdata/sles/testdata/version-1.15.10.yaml
+++ b/pkg/userdata/sles/testdata/version-1.15.10.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/version-1.16.3.yaml b/pkg/userdata/sles/testdata/version-1.16.3.yaml
index f2650026..15a18544 100644
--- a/pkg/userdata/sles/testdata/version-1.16.3.yaml
+++ b/pkg/userdata/sles/testdata/version-1.16.3.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/version-1.17.1.yaml b/pkg/userdata/sles/testdata/version-1.17.1.yaml
index 504e6f3c..183b7eaa 100644
--- a/pkg/userdata/sles/testdata/version-1.17.1.yaml
+++ b/pkg/userdata/sles/testdata/version-1.17.1.yaml
@@ -67,7 +67,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/vsphere-mirrors.yaml b/pkg/userdata/sles/testdata/vsphere-mirrors.yaml
index 19be7f81..8b9c4da5 100644
--- a/pkg/userdata/sles/testdata/vsphere-mirrors.yaml
+++ b/pkg/userdata/sles/testdata/vsphere-mirrors.yaml
@@ -77,7 +77,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/vsphere-proxy.yaml b/pkg/userdata/sles/testdata/vsphere-proxy.yaml
index 1b32dc8b..a1d63e24 100644
--- a/pkg/userdata/sles/testdata/vsphere-proxy.yaml
+++ b/pkg/userdata/sles/testdata/vsphere-proxy.yaml
@@ -77,7 +77,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/sles/testdata/vsphere.yaml b/pkg/userdata/sles/testdata/vsphere.yaml
index 38285c26..ee968020 100644
--- a/pkg/userdata/sles/testdata/vsphere.yaml
+++ b/pkg/userdata/sles/testdata/vsphere.yaml
@@ -68,7 +68,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
index 05311ed1..146ab3cd 100644
--- a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
+++ b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
@@ -166,7 +166,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
index 849a334b..aadb941f 100644
--- a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
+++ b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
index 3f59301c..47cfb52e 100644
--- a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
+++ b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
index 62eda37b..a20b213e 100644
--- a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
+++ b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
@@ -166,7 +166,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
index 8f3c0c37..c6f94607 100644
--- a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
+++ b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/openstack.yaml b/pkg/userdata/ubuntu/testdata/openstack.yaml
index c512d585..8e59bfb6 100644
--- a/pkg/userdata/ubuntu/testdata/openstack.yaml
+++ b/pkg/userdata/ubuntu/testdata/openstack.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/version-1.15.10.yaml b/pkg/userdata/ubuntu/testdata/version-1.15.10.yaml
index 0c03d91c..290bf2d9 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.15.10.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.15.10.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/version-1.16.6.yaml b/pkg/userdata/ubuntu/testdata/version-1.16.6.yaml
index 584019fe..f2ec5ab9 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.16.6.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.16.6.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/version-1.17.3.yaml b/pkg/userdata/ubuntu/testdata/version-1.17.3.yaml
index 849a334b..aadb941f 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.17.3.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.17.3.yaml
@@ -164,7 +164,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml b/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
index ef150e2f..41d91bee 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
@@ -174,7 +174,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml b/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
index 9853db12..fad72733 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
@@ -174,7 +174,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
diff --git a/pkg/userdata/ubuntu/testdata/vsphere.yaml b/pkg/userdata/ubuntu/testdata/vsphere.yaml
index 162af8cc..efcdf0f6 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere.yaml
@@ -165,7 +165,7 @@ write_files:
     cni_bin_dir=/opt/cni/bin
     mkdir -p /etc/cni/net.d /etc/kubernetes/dynamic-config-dir /etc/kubernetes/manifests "$opt_bin" "$cni_bin_dir"
     arch=${HOST_ARCH:-amd64}
-    CNI_VERSION="${CNI_VERSION:-v0.8.2}"
+    CNI_VERSION="${CNI_VERSION:-v0.8.6}"
     cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
     cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
     curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"