From dc881cbc77bc7311f3277d6baa71828115e2c871 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Mon, 25 Apr 2022 15:06:30 -0700 Subject: [PATCH] GCE Windows: Copy the CNI binaries from the right folder A previous commit updated the containerd version used on Windows nodes from 1.5.4 to 1.6.2. However, the folder structure of the containerd releases changed since then from: cni/$binary.exe to: cni/bin/$binary.exe Because of this, the Windows nodes do not have the necessary CNI binaries needed to setup the pod networks. --- cluster/gce/windows/k8s-node-setup.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index 90f206e1c73..e0a2ac6404d 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -1368,7 +1368,7 @@ function Install_Containerd { -Algorithm SHA256 tar xzvf $tmp_dir\containerd.tar.gz -C $tmp_dir - Move-Item -Force $tmp_dir\cni\*.exe "${env:CNI_DIR}\" + Move-Item -Force $tmp_dir\cni\bin\*.exe "${env:CNI_DIR}\" Move-Item -Force $tmp_dir\*.exe "${env:NODE_DIR}\" Remove-Item -Force -Recurse $tmp_dir