From 94e91d7f0363f501554ce08f8a7b86348153bc95 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 20 Oct 2020 17:27:45 -0700 Subject: [PATCH] Omit error message if 100-crio-bridge.conf has already been disabled --- pkg/minikube/cni/flannel.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/cni/flannel.go b/pkg/minikube/cni/flannel.go index b3e659cb11cb..27e199f1187a 100644 --- 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) }