Merge pull request #49483 from xiangpengzhao/e2e-sig-network
Automatic merge from submit-queue (batch tested with PRs 48846, 49483, 49341) Add [sig-network] prefix to network e2e tests **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # Associated PR #48784 Umbrella issue #49161 **Special notes for your reviewer**: /assign @@wojtek-t @freehan /cc @bowei **Release note**: ```release-note NONE ```
This commit is contained in:
		| @@ -15,6 +15,7 @@ go_library( | |||||||
|         "dns_configmap.go", |         "dns_configmap.go", | ||||||
|         "doc.go", |         "doc.go", | ||||||
|         "firewall.go", |         "firewall.go", | ||||||
|  |         "framework.go", | ||||||
|         "kube_proxy.go", |         "kube_proxy.go", | ||||||
|         "network_policy.go", |         "network_policy.go", | ||||||
|         "networking.go", |         "networking.go", | ||||||
|   | |||||||
| @@ -286,7 +286,7 @@ func reverseArray(arr []string) []string { | |||||||
| 	return arr | 	return arr | ||||||
| } | } | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("DNS", func() { | var _ = SIGDescribe("DNS", func() { | ||||||
| 	f := framework.NewDefaultFramework("dns") | 	f := framework.NewDefaultFramework("dns") | ||||||
|  |  | ||||||
| 	It("should provide DNS for the cluster [Conformance]", func() { | 	It("should provide DNS for the cluster [Conformance]", func() { | ||||||
|   | |||||||
| @@ -22,7 +22,6 @@ import ( | |||||||
|  |  | ||||||
| 	"k8s.io/api/core/v1" | 	"k8s.io/api/core/v1" | ||||||
| 	"k8s.io/apimachinery/pkg/util/wait" | 	"k8s.io/apimachinery/pkg/util/wait" | ||||||
| 	"k8s.io/kubernetes/test/e2e/framework" |  | ||||||
|  |  | ||||||
| 	. "github.com/onsi/ginkgo" | 	. "github.com/onsi/ginkgo" | ||||||
| ) | ) | ||||||
| @@ -34,7 +33,7 @@ type dnsFederationsConfigMapTest struct { | |||||||
| 	isValid bool | 	isValid bool | ||||||
| } | } | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("DNS configMap federations", func() { | var _ = SIGDescribe("DNS configMap federations", func() { | ||||||
| 	t := &dnsNameserverTest{dnsTestCommon: newDnsTestCommon()} | 	t := &dnsNameserverTest{dnsTestCommon: newDnsTestCommon()} | ||||||
| 	BeforeEach(func() { t.c = t.f.ClientSet }) | 	BeforeEach(func() { t.c = t.f.ClientSet }) | ||||||
|  |  | ||||||
| @@ -186,7 +185,7 @@ func (t *dnsNameserverTest) run() { | |||||||
| 		moreForeverTestTimeout) | 		moreForeverTestTimeout) | ||||||
| } | } | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("DNS configMap nameserver", func() { | var _ = SIGDescribe("DNS configMap nameserver", func() { | ||||||
| 	t := &dnsNameserverTest{dnsTestCommon: newDnsTestCommon()} | 	t := &dnsNameserverTest{dnsTestCommon: newDnsTestCommon()} | ||||||
| 	BeforeEach(func() { t.c = t.f.ClientSet }) | 	BeforeEach(func() { t.c = t.f.ClientSet }) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ import ( | |||||||
| 	. "github.com/onsi/gomega" | 	. "github.com/onsi/gomega" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("Firewall rule", func() { | var _ = SIGDescribe("Firewall rule", func() { | ||||||
| 	var firewall_test_name = "firewall-test" | 	var firewall_test_name = "firewall-test" | ||||||
| 	f := framework.NewDefaultFramework(firewall_test_name) | 	f := framework.NewDefaultFramework(firewall_test_name) | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										23
									
								
								test/e2e/network/framework.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								test/e2e/network/framework.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | /* | ||||||
|  | Copyright 2017 The Kubernetes Authors. | ||||||
|  |  | ||||||
|  | Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
|  | you may not use this file except in compliance with the License. | ||||||
|  | You may obtain a copy of the License at | ||||||
|  |  | ||||||
|  |     http://www.apache.org/licenses/LICENSE-2.0 | ||||||
|  |  | ||||||
|  | Unless required by applicable law or agreed to in writing, software | ||||||
|  | distributed under the License is distributed on an "AS IS" BASIS, | ||||||
|  | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
|  | See the License for the specific language governing permissions and | ||||||
|  | limitations under the License. | ||||||
|  | */ | ||||||
|  |  | ||||||
|  | package network | ||||||
|  |  | ||||||
|  | import "github.com/onsi/ginkgo" | ||||||
|  |  | ||||||
|  | func SIGDescribe(text string, body func()) bool { | ||||||
|  | 	return ginkgo.Describe("[sig-network] "+text, body) | ||||||
|  | } | ||||||
| @@ -36,7 +36,7 @@ import ( | |||||||
|  |  | ||||||
| const kubeProxyE2eImage = "gcr.io/google_containers/e2e-net-amd64:1.0" | const kubeProxyE2eImage = "gcr.io/google_containers/e2e-net-amd64:1.0" | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("Network", func() { | var _ = SIGDescribe("Network", func() { | ||||||
| 	const ( | 	const ( | ||||||
| 		testDaemonHttpPort    = 11301 | 		testDaemonHttpPort    = 11301 | ||||||
| 		testDaemonTcpPort     = 11302 | 		testDaemonTcpPort     = 11302 | ||||||
|   | |||||||
| @@ -38,7 +38,7 @@ connections from one of the clients. The test then asserts that the clients | |||||||
| failed or succesfully connected as expected. | failed or succesfully connected as expected. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("NetworkPolicy", func() { | var _ = SIGDescribe("NetworkPolicy", func() { | ||||||
| 	f := framework.NewDefaultFramework("network-policy") | 	f := framework.NewDefaultFramework("network-policy") | ||||||
|  |  | ||||||
| 	It("should support a 'default-deny' policy [Feature:NetworkPolicy]", func() { | 	It("should support a 'default-deny' policy [Feature:NetworkPolicy]", func() { | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ import ( | |||||||
| 	. "github.com/onsi/ginkgo" | 	. "github.com/onsi/ginkgo" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("Networking", func() { | var _ = SIGDescribe("Networking", func() { | ||||||
| 	var svcname = "nettest" | 	var svcname = "nettest" | ||||||
| 	f := framework.NewDefaultFramework(svcname) | 	f := framework.NewDefaultFramework(svcname) | ||||||
|  |  | ||||||
| @@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("Networking", func() { | |||||||
| 	}) | 	}) | ||||||
|  |  | ||||||
| 	// TODO: Remove [Slow] when this has had enough bake time to prove presubmit worthiness. | 	// TODO: Remove [Slow] when this has had enough bake time to prove presubmit worthiness. | ||||||
| 	framework.KubeDescribe("Granular Checks: Services [Slow]", func() { | 	SIGDescribe("Granular Checks: Services [Slow]", func() { | ||||||
|  |  | ||||||
| 		It("should function for pod-Service: http", func() { | 		It("should function for pod-Service: http", func() { | ||||||
| 			config := framework.NewNetworkingTestConfig(f) | 			config := framework.NewNetworkingTestConfig(f) | ||||||
|   | |||||||
| @@ -37,7 +37,7 @@ const ( | |||||||
|  |  | ||||||
| // Declared as Flakey since it has not been proven to run in parallel on small nodes or slow networks in CI | // Declared as Flakey since it has not been proven to run in parallel on small nodes or slow networks in CI | ||||||
| // TODO jayunit100 : Retag this test according to semantics from #22401 | // TODO jayunit100 : Retag this test according to semantics from #22401 | ||||||
| var _ = framework.KubeDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-Performance]", func() { | var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-Performance]", func() { | ||||||
|  |  | ||||||
| 	f := framework.NewDefaultFramework("network-perf") | 	f := framework.NewDefaultFramework("network-perf") | ||||||
|  |  | ||||||
|   | |||||||
| @@ -39,7 +39,7 @@ import ( | |||||||
| 	. "github.com/onsi/gomega" | 	. "github.com/onsi/gomega" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("Services", func() { | var _ = SIGDescribe("Services", func() { | ||||||
| 	f := framework.NewDefaultFramework("services") | 	f := framework.NewDefaultFramework("services") | ||||||
|  |  | ||||||
| 	var cs clientset.Interface | 	var cs clientset.Interface | ||||||
| @@ -1409,7 +1409,7 @@ var _ = framework.KubeDescribe("Services", func() { | |||||||
| 	}) | 	}) | ||||||
| }) | }) | ||||||
|  |  | ||||||
| var _ = framework.KubeDescribe("ESIPP [Slow]", func() { | var _ = SIGDescribe("ESIPP [Slow]", func() { | ||||||
| 	f := framework.NewDefaultFramework("esipp") | 	f := framework.NewDefaultFramework("esipp") | ||||||
| 	loadBalancerCreateTimeout := framework.LoadBalancerCreateTimeoutDefault | 	loadBalancerCreateTimeout := framework.LoadBalancerCreateTimeoutDefault | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Kubernetes Submit Queue
					Kubernetes Submit Queue