Skip to content

Commit c75e30d

Browse files
authored
Merge pull request kubernetes#126294 from aojea/nosnat
e2e test for No SNAT
2 parents 5af1710 + 046e976 commit c75e30d

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

test/e2e/feature/feature.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@ var (
251251
// TODO: document the feature (owning SIG, when to use this feature for a test)
252252
NodeOutOfServiceVolumeDetach = framework.WithFeature(framework.ValidFeatures.Add("NodeOutOfServiceVolumeDetach"))
253253

254-
// Owner: sig-network
255-
// Marks a single test that tests pod-to-pod connectivity between every pair of nodes.
256-
NoSNAT = framework.WithFeature(framework.ValidFeatures.Add("NoSNAT"))
257-
258254
// Owner: sig-network
259255
// Marks a single test that tests cluster DNS performance with many services.
260256
PerformanceDNS = framework.WithFeature(framework.ValidFeatures.Add("PerformanceDNS"))

test/e2e/network/no_snat.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
admissionapi "k8s.io/pod-security-admission/api"
3131

32-
"k8s.io/kubernetes/test/e2e/feature"
3332
"k8s.io/kubernetes/test/e2e/framework"
3433
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3534
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -64,15 +63,15 @@ var (
6463

6564
// This test verifies that a Pod on each node in a cluster can talk to Pods on every other node without SNAT.
6665
// We use the [Feature:NoSNAT] tag so that most jobs will skip this test by default.
67-
var _ = common.SIGDescribe("NoSNAT", feature.NoSNAT, framework.WithSlow(), func() {
66+
var _ = common.SIGDescribe("NoSNAT", func() {
6867
f := framework.NewDefaultFramework("no-snat-test")
6968
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
7069
ginkgo.It("Should be able to send traffic between Pods without SNAT", func(ctx context.Context) {
7170
cs := f.ClientSet
7271
pc := cs.CoreV1().Pods(f.Namespace.Name)
7372

7473
ginkgo.By("creating a test pod on each Node")
75-
nodes, err := e2enode.GetReadySchedulableNodes(ctx, cs)
74+
nodes, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, 3)
7675
framework.ExpectNoError(err)
7776
gomega.Expect(nodes.Items).ToNot(gomega.BeEmpty(), "no Nodes in the cluster")
7877

0 commit comments

Comments
 (0)