Cleanup SIGDescribe in test/e2e/network

This commit is contained in:
wojtekt 2021-02-26 21:21:30 +01:00
parent bd190762fb
commit 749922fa46
29 changed files with 85 additions and 41 deletions

View File

@ -20,7 +20,6 @@ go_library(
"example_cluster_dns.go",
"firewall.go",
"fixture.go",
"framework.go",
"hostport.go",
"ingress.go",
"ingress_scale.go",
@ -89,6 +88,7 @@ go_library(
"//test/e2e/framework/service:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/e2e/framework/ssh:go_default_library",
"//test/e2e/network/common:go_default_library",
"//test/e2e/network/netpol:go_default_library",
"//test/e2e/network/scale:go_default_library",
"//test/e2e/storage/utils:go_default_library",
@ -115,6 +115,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//test/e2e/network/common:all-srcs",
"//test/e2e/network/netpol:all-srcs",
"//test/e2e/network/scale:all-srcs",
],

View File

@ -0,0 +1,23 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["framework.go"],
importpath = "k8s.io/kubernetes/test/e2e/network/common",
visibility = ["//visibility:public"],
deps = ["//vendor/github.com/onsi/ginkgo:go_default_library"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package network
package common
import "github.com/onsi/ginkgo"

View File

@ -33,6 +33,7 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
)
@ -63,7 +64,7 @@ const (
// Ref: https://api.semanticscholar.org/CorpusID:198903401
// Boye, Magnus. "Netfilter Connection Tracking and NAT Implementation." (2012).
var _ = SIGDescribe("Conntrack", func() {
var _ = common.SIGDescribe("Conntrack", func() {
fr := framework.NewDefaultFramework("conntrack")

View File

@ -29,6 +29,7 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
"github.com/onsi/ginkgo"
)
@ -36,7 +37,7 @@ import (
const dnsTestPodHostName = "dns-querier-1"
const dnsTestServiceName = "dns-test-service"
var _ = SIGDescribe("DNS", func() {
var _ = common.SIGDescribe("DNS", func() {
f := framework.NewDefaultFramework("dns")
/*

View File

@ -25,6 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/test/e2e/framework"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
"k8s.io/kubernetes/test/e2e/network/common"
"github.com/onsi/ginkgo"
)
@ -314,7 +315,7 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
t.restoreDNSConfigMap(originalConfigMapData)
}
var _ = SIGDescribe("DNS configMap nameserver", func() {
var _ = common.SIGDescribe("DNS configMap nameserver", func() {
ginkgo.Context("Change stubDomain", func() {
nsTest := &dnsNameserverTest{dnsTestCommon: newDNSTestCommon()}

View File

@ -28,6 +28,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/test/e2e/framework"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
"k8s.io/kubernetes/test/e2e/network/common"
testutils "k8s.io/kubernetes/test/utils"
"github.com/onsi/ginkgo"
@ -40,7 +41,7 @@ const (
checkServicePercent = 0.05
)
var _ = SIGDescribe("[Feature:PerformanceDNS][Serial]", func() {
var _ = common.SIGDescribe("[Feature:PerformanceDNS][Serial]", func() {
f := framework.NewDefaultFramework("performancedns")
ginkgo.BeforeEach(func() {

View File

@ -36,12 +36,13 @@ import (
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
netutils "k8s.io/utils/net"
)
// Tests for ipv6 dual stack feature
var _ = SIGDescribe("[Feature:IPv6DualStackAlphaFeature] [LinuxOnly]", func() {
var _ = common.SIGDescribe("[Feature:IPv6DualStackAlphaFeature] [LinuxOnly]", func() {
f := framework.NewDefaultFramework("dualstack")
var cs clientset.Interface

View File

@ -31,12 +31,13 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
"github.com/onsi/ginkgo"
)
var _ = SIGDescribe("EndpointSlice", func() {
var _ = common.SIGDescribe("EndpointSlice", func() {
f := framework.NewDefaultFramework("endpointslice")
var cs clientset.Interface

View File

@ -28,9 +28,10 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/network/common"
)
var _ = SIGDescribe("EndpointSliceMirroring", func() {
var _ = common.SIGDescribe("EndpointSliceMirroring", func() {
f := framework.NewDefaultFramework("endpointslicemirroring")
var cs clientset.Interface

View File

@ -38,6 +38,7 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eresource "k8s.io/kubernetes/test/e2e/framework/resource"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
"k8s.io/kubernetes/test/e2e/network/common"
)
const (
@ -55,7 +56,7 @@ try:
except:
print('err')`
var _ = SIGDescribe("ClusterDns [Feature:Example]", func() {
var _ = common.SIGDescribe("ClusterDns [Feature:Example]", func() {
f := framework.NewDefaultFramework("cluster-dns")
var c clientset.Interface

View File

@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
gcecloud "k8s.io/legacy-cloud-providers/gce"
"github.com/onsi/ginkgo"
@ -49,7 +50,7 @@ const (
firewallTestUDPPort = int32(29998)
)
var _ = SIGDescribe("Firewall rule", func() {
var _ = common.SIGDescribe("Firewall rule", func() {
var firewallTestName = "firewall-test"
f := framework.NewDefaultFramework(firewallTestName)

View File

@ -31,10 +31,11 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
)
var _ = SIGDescribe("HostPort", func() {
var _ = common.SIGDescribe("HostPort", func() {
f := framework.NewDefaultFramework("hostport")

View File

@ -47,6 +47,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
"github.com/onsi/ginkgo"
)
@ -56,7 +57,7 @@ const (
instanceGroupAnnotation = "ingress.gcp.kubernetes.io/instance-groups"
)
var _ = SIGDescribe("Loadbalancing: L7", func() {
var _ = common.SIGDescribe("Loadbalancing: L7", func() {
defer ginkgo.GinkgoRecover()
var (
ns string
@ -902,7 +903,7 @@ func detectNegAnnotation(f *framework.Framework, jig *e2eingress.TestJig, gceCon
}
}
var _ = SIGDescribe("Ingress API", func() {
var _ = common.SIGDescribe("Ingress API", func() {
f := framework.NewDefaultFramework("ingress")
/*
Release: v1.19

View File

@ -19,12 +19,13 @@ package network
import (
"k8s.io/kubernetes/test/e2e/framework"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
"k8s.io/kubernetes/test/e2e/network/scale"
"github.com/onsi/ginkgo"
)
var _ = SIGDescribe("Loadbalancing: L7 Scalability", func() {
var _ = common.SIGDescribe("Loadbalancing: L7 Scalability", func() {
defer ginkgo.GinkgoRecover()
var (
ns string

View File

@ -32,11 +32,12 @@ import (
"k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/network/common"
"github.com/onsi/ginkgo"
)
var _ = SIGDescribe("IngressClass [Feature:Ingress]", func() {
var _ = common.SIGDescribe("IngressClass [Feature:Ingress]", func() {
f := framework.NewDefaultFramework("ingressclass")
var cs clientset.Interface
ginkgo.BeforeEach(func() {
@ -142,7 +143,7 @@ func deleteIngressClass(cs clientset.Interface, name string) {
framework.ExpectNoError(err)
}
var _ = SIGDescribe("IngressClass API", func() {
var _ = common.SIGDescribe("IngressClass API", func() {
f := framework.NewDefaultFramework("ingressclass")
var cs clientset.Interface
ginkgo.BeforeEach(func() {

View File

@ -32,6 +32,7 @@ import (
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
netutils "k8s.io/utils/net"
@ -40,7 +41,7 @@ import (
var kubeProxyE2eImage = imageutils.GetE2EImage(imageutils.Agnhost)
var _ = SIGDescribe("KubeProxy", func() {
var _ = common.SIGDescribe("KubeProxy", func() {
const (
testDaemonHTTPPort = 11301
testDaemonTCPPort = 11302

View File

@ -42,13 +42,14 @@ import (
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
gcecloud "k8s.io/legacy-cloud-providers/gce"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)
var _ = SIGDescribe("LoadBalancers", func() {
var _ = common.SIGDescribe("LoadBalancers", func() {
f := framework.NewDefaultFramework("loadbalancers")
var cs clientset.Interface
@ -847,7 +848,7 @@ var _ = SIGDescribe("LoadBalancers", func() {
})
})
var _ = SIGDescribe("ESIPP [Slow]", func() {
var _ = common.SIGDescribe("ESIPP [Slow]", func() {
f := framework.NewDefaultFramework("esipp")
var loadBalancerCreateTimeout time.Duration

View File

@ -31,6 +31,7 @@ go_library(
"//test/e2e/framework/node:go_default_library",
"//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/e2e/network/common:go_default_library",
"//test/e2e/storage/utils:go_default_library",
"//test/utils/image:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",

View File

@ -40,7 +40,7 @@ import (
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
utilnet "k8s.io/utils/net"
)
@ -59,7 +59,7 @@ type protocolPort struct {
protocol v1.Protocol
}
var _ = SIGDescribeCopy("NetworkPolicy [LinuxOnly]", func() {
var _ = common.SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
var service *v1.Service
var podServer *v1.Pod
var podServerLabelSelector string
@ -1725,7 +1725,7 @@ var _ = SIGDescribeCopy("NetworkPolicy [LinuxOnly]", func() {
})
})
var _ = SIGDescribeCopy("NetworkPolicy [Feature:SCTPConnectivity][LinuxOnly][Disruptive]", func() {
var _ = common.SIGDescribe("NetworkPolicy [Feature:SCTPConnectivity][LinuxOnly][Disruptive]", func() {
var service *v1.Service
var podServer *v1.Pod
var podServerLabelSelector string
@ -2181,7 +2181,7 @@ func cleanupNetworkPolicy(f *framework.Framework, policy *networkingv1.NetworkPo
}
}
var _ = SIGDescribeCopy("NetworkPolicy API", func() {
var _ = common.SIGDescribe("NetworkPolicy API", func() {
f := framework.NewDefaultFramework("networkpolicies")
/*
Release: v1.20

View File

@ -32,6 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/test/e2e/framework"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
utilnet "k8s.io/utils/net"
)
@ -116,12 +117,7 @@ and what is happening in practice:
z/c . . . . . . . . .
*/
// SIGDescribeCopy function SIGDescribe is COPIED from test/e2e/network/framework.go , so that we can avoid a cyclic dependency while we incubate these new tests.
func SIGDescribeCopy(text string, body func()) bool {
return ginkgo.Describe("[sig-network] "+text, body)
}
var _ = SIGDescribeCopy("Netpol [LinuxOnly]", func() {
var _ = common.SIGDescribe("Netpol [LinuxOnly]", func() {
f := framework.NewDefaultFramework("netpol")
ginkgo.Context("NetworkPolicy between server and client", func() {
@ -991,7 +987,7 @@ var _ = SIGDescribeCopy("Netpol [LinuxOnly]", func() {
})
})
var _ = SIGDescribeCopy("Netpol [Feature:UDPConnectivity][LinuxOnly]", func() {
var _ = common.SIGDescribe("Netpol [Feature:UDPConnectivity][LinuxOnly]", func() {
f := framework.NewDefaultFramework("udp-network-policy")
ginkgo.BeforeEach(func() {
@ -1065,7 +1061,7 @@ var _ = SIGDescribeCopy("Netpol [Feature:UDPConnectivity][LinuxOnly]", func() {
})
})
var _ = SIGDescribeCopy("Netpol [Feature:SCTPConnectivity][LinuxOnly][Disruptive]", func() {
var _ = common.SIGDescribe("Netpol [Feature:SCTPConnectivity][LinuxOnly][Disruptive]", func() {
f := framework.NewDefaultFramework("sctp-network-policy")
ginkgo.BeforeEach(func() {

View File

@ -30,9 +30,10 @@ import (
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/network/common"
)
var _ = SIGDescribeCopy("Netpol API", func() {
var _ = common.SIGDescribe("Netpol API", func() {
f := framework.NewDefaultFramework("netpol")
/*
Release: v1.20

View File

@ -32,12 +32,13 @@ import (
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
gcecloud "k8s.io/legacy-cloud-providers/gce"
"github.com/onsi/ginkgo"
)
var _ = SIGDescribe("Services [Slow]", func() {
var _ = common.SIGDescribe("Services [Slow]", func() {
f := framework.NewDefaultFramework("services")
var cs clientset.Interface

View File

@ -33,6 +33,7 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
"k8s.io/kubernetes/test/e2e/network/common"
"github.com/onsi/ginkgo"
)
@ -75,7 +76,7 @@ func checkConnectivityToHost(f *framework.Framework, nodeName, podName, host str
return err
}
var _ = SIGDescribe("Networking", func() {
var _ = common.SIGDescribe("Networking", func() {
var svcname = "nettest"
f := framework.NewDefaultFramework(svcname)

View File

@ -32,6 +32,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
)
@ -179,7 +180,7 @@ func iperf2ClientDaemonSet(client clientset.Interface, namespace string) (*appsv
// would require n^2 tests, n^2 time, and n^2 network resources which quickly become prohibitively large
// as the cluster size increases.
// Finally, after collecting all data, the results are analyzed and tabulated.
var _ = SIGDescribe("Networking IPerf2 [Feature:Networking-Performance]", func() {
var _ = common.SIGDescribe("Networking IPerf2 [Feature:Networking-Performance]", func() {
// this test runs iperf2: one pod as a server, and a daemonset of clients
f := framework.NewDefaultFramework("network-perf")

View File

@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
)
@ -58,7 +59,7 @@ var (
// This test verifies that a Pod on each node in a cluster can talk to Pods on every other node without SNAT.
// We use the [Feature:NoSNAT] tag so that most jobs will skip this test by default.
var _ = SIGDescribe("NoSNAT [Feature:NoSNAT] [Slow]", func() {
var _ = common.SIGDescribe("NoSNAT [Feature:NoSNAT] [Slow]", func() {
f := framework.NewDefaultFramework("no-snat-test")
ginkgo.It("Should be able to send traffic between Pods without SNAT", func() {
cs := f.ClientSet

View File

@ -40,6 +40,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
"k8s.io/kubernetes/test/e2e/network/common"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
@ -68,7 +69,7 @@ type jsonResponse struct {
Body string
}
var _ = SIGDescribe("Proxy", func() {
var _ = common.SIGDescribe("Proxy", func() {
version := "v1"
ginkgo.Context("version "+version, func() {
options := framework.Options{

View File

@ -56,6 +56,7 @@ import (
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
"k8s.io/kubernetes/test/e2e/storage/utils"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
@ -731,7 +732,7 @@ func getEndpointNodesWithInternalIP(jig *e2eservice.TestJig) (map[string]string,
return endpointsNodeMap, nil
}
var _ = SIGDescribe("Services", func() {
var _ = common.SIGDescribe("Services", func() {
f := framework.NewDefaultFramework("services")
var cs clientset.Interface
@ -2622,7 +2623,7 @@ func restartComponent(cs clientset.Interface, cName, ns string, matchLabels map[
return err
}
var _ = SIGDescribe("SCTP [Feature:SCTP] [LinuxOnly]", func() {
var _ = common.SIGDescribe("SCTP [Feature:SCTP] [LinuxOnly]", func() {
f := framework.NewDefaultFramework("sctp")
var cs clientset.Interface

View File

@ -33,6 +33,7 @@ import (
"k8s.io/client-go/util/flowcontrol"
"k8s.io/kubernetes/test/e2e/framework"
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
"k8s.io/kubernetes/test/e2e/network/common"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
@ -45,7 +46,7 @@ func (d durations) Len() int { return len(d) }
func (d durations) Less(i, j int) bool { return d[i] < d[j] }
func (d durations) Swap(i, j int) { d[i], d[j] = d[j], d[i] }
var _ = SIGDescribe("Service endpoints latency", func() {
var _ = common.SIGDescribe("Service endpoints latency", func() {
f := framework.NewDefaultFramework("svc-latency")
/*