From 9283429f22905ca707fec6c42de007220e124363 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 15 Feb 2023 16:30:58 -0500 Subject: [PATCH] Remove checks for userspace proxy mode in e2e tests It's gone --- test/e2e/network/service.go | 90 ------------------------------------- 1 file changed, 90 deletions(-) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index af750c935a1..07ba4e106c2 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -1015,16 +1015,6 @@ var _ = common.SIGDescribe("Services", func() { // this test is creating a pod with HostNetwork=true, which is not supported on Windows. e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - serviceName := "sourceip-test" ns := f.Namespace.Name @@ -2480,16 +2470,6 @@ var _ = common.SIGDescribe("Services", func() { // TODO: remove this skip when windows-based proxies implement internalTrafficPolicy e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -2558,16 +2538,6 @@ var _ = common.SIGDescribe("Services", func() { // TODO: remove this skip when windows-based proxies implement internalTrafficPolicy e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -2638,16 +2608,6 @@ var _ = common.SIGDescribe("Services", func() { // TODO: remove this skip when windows-based proxies implement internalTrafficPolicy e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -2749,16 +2709,6 @@ var _ = common.SIGDescribe("Services", func() { // windows kube-proxy does not support this feature yet e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -2848,16 +2798,6 @@ var _ = common.SIGDescribe("Services", func() { // windows kube-proxy does not support this feature yet e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -2931,16 +2871,6 @@ var _ = common.SIGDescribe("Services", func() { // windows kube-proxy does not support this feature yet e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -3019,16 +2949,6 @@ var _ = common.SIGDescribe("Services", func() { // windows kube-proxy does not support this feature yet e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items) @@ -3104,16 +3024,6 @@ var _ = common.SIGDescribe("Services", func() { // windows kube-proxy does not support this feature yet e2eskipper.SkipIfNodeOSDistroIs("windows") - // This behavior is not supported if Kube-proxy is in "userspace" mode. - // So we check the kube-proxy mode and skip this test if that's the case. - if proxyMode, err := proxyMode(ctx, f); err == nil { - if proxyMode == "userspace" { - e2eskipper.Skipf("The test doesn't work with kube-proxy in userspace mode") - } - } else { - framework.Logf("Couldn't detect KubeProxy mode - test failure may be expected: %v", err) - } - nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 2) framework.ExpectNoError(err) nodeCounts := len(nodes.Items)