Replace hardcoded docker check with cni check

Author: afbjorklund

Diff for: test/integration/net_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/blang/semver/v4"
 	"k8s.io/minikube/pkg/kapi"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/reason"
 	"k8s.io/minikube/pkg/util"
 	"k8s.io/minikube/pkg/util/retry"
@@ -53,8 +54,8 @@ func TestNetworkPlugins(t *testing.T) {
 			podLabel      string
 			hairpin       bool
 		}{
-			// for containerd and crio runtimes kindnet CNI is used by default and hairpin is enabled
-			{"auto", []string{}, "", "", ContainerRuntime() != "docker"},
+			// kindnet CNI is used by default and hairpin is enabled
+			{"auto", []string{}, "", "", usingCNI()},
 			{"kubenet", []string{"--network-plugin=kubenet"}, "kubenet", "", true},
 			{"bridge", []string{"--cni=bridge"}, "cni", "", true},
 			{"enable-default-cni", []string{"--enable-default-cni=true"}, "cni", "", true},
@@ -79,15 +80,14 @@ func TestNetworkPlugins(t *testing.T) {
 					t.Skipf("flannel is not yet compatible with Docker driver: iptables v1.8.3 (legacy): Couldn't load target `CNI-x': No such file or directory")
 				}
 
-				if ContainerRuntime() != "docker" && tc.name == "false" {
+				if usingCNI() && tc.name == "false" {
 					// CNI is required for current container runtime
 					validateFalseCNI(ctx, t, profile)
 					return
 				}
 
-				if ContainerRuntime() != "docker" && tc.name == "kubenet" {
+				if usingCNI() && tc.name == "kubenet" {
 					// CNI is disabled when --network-plugin=kubenet option is passed. See cni.New(..) function
-					// But for containerd/crio CNI has to be configured
 					t.Skipf("Skipping the test as %s container runtimes requires CNI", ContainerRuntime())
 				}
 
@@ -207,6 +207,21 @@ func TestNetworkPlugins(t *testing.T) {
 	})
 }
 
+// usingCNI checks if not using dockershim
+func usingCNI() bool {
+	if ContainerRuntime() != "docker" {
+		return true
+	}
+	version, err := util.ParseKubernetesVersion(constants.DefaultKubernetesVersion)
+	if err != nil {
+		return false
+	}
+	if version.GTE(semver.MustParse("1.24.0-alpha.2")) {
+		return true
+	}
+	return false
+}
+
 // validateFalseCNI checks that minikube returns and error
 // if container runtime is "containerd" or "crio"
 // and --cni=false