Skip to content

Commit

Permalink
Merge pull request kubernetes#96640 from aojea/kubenetsctp
Browse files Browse the repository at this point in the history
e2e SCTP test must not depend on kubenet
  • Loading branch information
k8s-ci-robot authored Nov 18, 2020
2 parents 89b52c7 + 5967475 commit bd2f96d
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions test/e2e/network/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -3799,18 +3799,10 @@ var _ = SIGDescribe("SCTP [Feature:SCTP] [LinuxOnly]", func() {
})

ginkgo.It("should create a Pod with SCTP HostPort", func() {
ginkgo.By("checking whether kubenet is used")
node, err := e2enode.GetRandomReadySchedulableNode(cs)
framework.ExpectNoError(err)
hostExec := utils.NewHostExec(f)
defer hostExec.Cleanup()
cmd := "ps -C kubelet -o cmd= | grep kubenet"
framework.Logf("Executing cmd %q on node %v", cmd, node.Name)
err = hostExec.IssueCommand(cmd, node)
if err != nil {
e2eskipper.Skipf("Interrogation of kubenet usage failed on node %s", node.Name)
}
framework.Logf("kubenet is in use")

ginkgo.By("getting the state of the sctp module on the selected node")
nodes := &v1.NodeList{}
Expand All @@ -3829,7 +3821,7 @@ var _ = SIGDescribe("SCTP [Feature:SCTP] [LinuxOnly]", func() {
framework.ExpectNoError(err, "failed to delete pod: %s in namespace: %s", podName, f.Namespace.Name)
}()
// wait until host port manager syncs rules
cmd = "iptables-save"
cmd := "iptables-save"
if framework.TestContext.ClusterIsIPv6() {
cmd = "ip6tables-save"
}
Expand Down

0 comments on commit bd2f96d

Please sign in to comment.