fix cri-o: ignore disabled cnis

Author: prezha

pkg/minikube/cni/cni.go

@@ -209,7 +209,7 @@ func ConfigureLoopbackCNI(r Runner, disable bool) error {
 		return nil
 	}
 
-	findExec := []string{"find", filepath.Dir(loopback), "-maxdepth", "1", "-type", "f", "-name", filepath.Base(loopback), "-exec", "sh", "-c"}
+	findExec := []string{"find", filepath.Dir(loopback), "-maxdepth", "1", "-type", "f", "-name", filepath.Base(loopback), "-not", "-name", "*.mk_disabled", "-exec", "sh", "-c"}
 
 	if disable {
 		if _, err := r.RunCmd(exec.Command(
@@ -248,7 +248,7 @@ func disableAllBridgeCNIs(r Runner) error {
 
 	out, err := r.RunCmd(exec.Command(
 		// for cri-o, we also disable 87-podman.conflist (that does not have 'bridge' in its name)
-		"sudo", "find", path, "-maxdepth", "1", "-type", "f", "(", "-name", "*bridge*", "-or", "-name", "*podman*", "-and", "-not", "-name", "*.mk_disabled", ")", "-printf", "%p, ", "-exec", "sh", "-c",
+		"sudo", "find", path, "-maxdepth", "1", "-type", "f", "(", "(", "-name", "*bridge*", "-or", "-name", "*podman*", ")", "-and", "-not", "-name", "*.mk_disabled", ")", "-printf", "%p, ", "-exec", "sh", "-c",
 		`sudo mv {} {}.mk_disabled`, ";"))
 	if err != nil {
 		return fmt.Errorf("failed to disable all bridge cni configs in %q: %v", path, err)

pkg/minikube/cruntime/crio.go

@@ -71,11 +71,15 @@ func generateCRIOConfig(cr CommandRunner, imageRepository string, kv semver.Vers
 	if _, err := cr.RunCmd(exec.Command("sh", "-c", fmt.Sprintf(`sudo sed -i 's|^.*cgroup_manager = .*$|cgroup_manager = %q|' %s`, cgroupDriver, crioConfigFile))); err != nil {
 		return errors.Wrap(err, "configuring cgroup_manager")
 	}
-	// avoid errors like:
+	// explicitly set conmon_cgroup to avoid errors like:
 	// - level=fatal msg="Validating runtime config: conmon cgroup should be 'pod' or a systemd slice"
 	// - level=fatal msg="Validating runtime config: cgroupfs manager conmon cgroup should be 'pod' or empty"
 	// ref: https://github.com/cri-o/cri-o/pull/3940
 	// ref: https://github.com/cri-o/cri-o/issues/6047
+	// ref: https://kubernetes.io/docs/setup/production-environment/container-runtimes/#cgroup-driver
+	if _, err := cr.RunCmd(exec.Command("sh", "-c", fmt.Sprintf(`sudo sed -i '/conmon_cgroup = .*/d' %s`, crioConfigFile))); err != nil {
+		return errors.Wrap(err, "removing conmon_cgroup")
+	}
 	if _, err := cr.RunCmd(exec.Command("sh", "-c", fmt.Sprintf(`sudo sed -i '/cgroup_manager = .*/a conmon_cgroup = %q' %s`, "pod", crioConfigFile))); err != nil {
 		return errors.Wrap(err, "configuring conmon_cgroup")
 	}