Skip to content

Commit 2576422

Browse files
afbjorklundspowelljr
authored andcommitted
The CNI warnings are not given for Docker
You can still use other network plugins, with it. Just that cni is now used by default, for 1.24 up.
1 parent 425f129 commit 2576422

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: test/integration/net_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ func TestNetworkPlugins(t *testing.T) {
8282
// collect debug logs
8383
defer debugLogs(t, profile)
8484

85-
if usingCNI() && tc.name == "false" {
85+
if ContainerRuntime() != "docker" && tc.name == "false" {
8686
// CNI is required for current container runtime
8787
validateFalseCNI(ctx, t, profile)
8888
return
8989
}
9090

91-
if usingCNI() && tc.name == "kubenet" {
91+
if ContainerRuntime() != "docker" && tc.name == "kubenet" {
9292
// CNI is disabled when --network-plugin=kubenet option is passed. See cni.New(..) function
9393
t.Skipf("Skipping the test as %s container runtimes requires CNI", ContainerRuntime())
9494
}

0 commit comments

Comments
 (0)