Merge pull request #9505 from tstromberg/hush-flannel

Omit error message if 100-crio-bridge.conf has already been disabled
kubernetes · Oct 22, 2020 · 9248335 · 9248335
2 parents 05de825 + 94e91d7
commit 9248335
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/minikube/cni/flannel.go b/pkg/minikube/cni/flannel.go
@@ -651,7 +651,14 @@ func (c Flannel) Apply(r Runner) error {
 
 	if driver.IsKIC(c.cc.Driver) {
 		conflict := "/etc/cni/net.d/100-crio-bridge.conf"
-		_, err := r.RunCmd(exec.Command("sudo", "mv", conflict, filepath.Join(filepath.Dir(conflict), "DISABLED-"+filepath.Base(conflict))))
+
+		_, err := r.RunCmd(exec.Command("stat", conflict))
+		if err != nil {
+			klog.Warningf("%s not found, skipping disable step: %v", conflict, err)
+			return nil
+		}
+
+		_, err = r.RunCmd(exec.Command("sudo", "mv", conflict, filepath.Join(filepath.Dir(conflict), "DISABLED-"+filepath.Base(conflict))))
 		if err != nil {
 			klog.Errorf("unable to disable %s: %v", conflict, err)
 		}