Force create cni folders when starting Windows containerd agent (#4685)

Create /opt/cni/bin/ and /etc/cni/net.d/ folders to avoid errors caused by non-existent paths. Fixes #4680 Signed-off-by: Shuyang Xin <gavinx@vmware.com>
antrea-io · Mar 10, 2023 · 35ddd50 · 35ddd50
1 parent dd564e6
commit 35ddd50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/build/yamls/antrea-windows-containerd.yml b/build/yamls/antrea-windows-containerd.yml
@@ -9,6 +9,8 @@ data:
     mkdir -force C:/var/run/secrets/kubernetes.io/serviceaccount
     cp $mountPath/var/run/secrets/kubernetes.io/serviceaccount/ca.crt C:/var/run/secrets/kubernetes.io/serviceaccount
     cp $mountPath/var/run/secrets/kubernetes.io/serviceaccount/token C:/var/run/secrets/kubernetes.io/serviceaccount
+    mkdir -force c:/opt/cni/bin/
+    mkdir -force c:/etc/cni/net.d/
     cp $mountPath/k/antrea/cni/* c:/opt/cni/bin/
     cp $mountPath/etc/antrea/antrea-cni.conflist c:/etc/cni/net.d/10-antrea.conflist
     mkdir -force c:/k/antrea/bin

diff --git a/build/yamls/windows/containerd/conf/Install-WindowsCNI-Containerd.ps1 b/build/yamls/windows/containerd/conf/Install-WindowsCNI-Containerd.ps1
@@ -5,6 +5,8 @@ $mountPath =  ($mountPath.Replace('\', '/')).TrimEnd('/')
 mkdir -force C:/var/run/secrets/kubernetes.io/serviceaccount
 cp $mountPath/var/run/secrets/kubernetes.io/serviceaccount/ca.crt C:/var/run/secrets/kubernetes.io/serviceaccount
 cp $mountPath/var/run/secrets/kubernetes.io/serviceaccount/token C:/var/run/secrets/kubernetes.io/serviceaccount
+mkdir -force c:/opt/cni/bin/
+mkdir -force c:/etc/cni/net.d/
 cp $mountPath/k/antrea/cni/* c:/opt/cni/bin/
 cp $mountPath/etc/antrea/antrea-cni.conflist c:/etc/cni/net.d/10-antrea.conflist
 mkdir -force c:/k/antrea/bin