diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 0fefc7e60f3..18b60054c16 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -161,7 +161,7 @@ test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_co test/e2e/common/secrets.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/create/data-1"}, test/e2e/common/secrets.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/delete/data-1"}, test/e2e/common/secrets.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/update/data-3"}, -test/e2e/no-snat.go: node_ip := v1.EnvVar{ +test/e2e/network/no_snat.go: node_ip := v1.EnvVar{ test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be %d; found %d", pid, expectedOOMScoreAdj, oomScore) test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be < %d; found %d", pid, expectedMaxOOMScoreAdj, oomScore) test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be >= %d; found %d", pid, expectedMinOOMScoreAdj, oomScore) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 199cb74d2f6..f54541a6474 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -58,18 +58,14 @@ go_library( "generated_clientset.go", "gke_local_ssd.go", "gke_node_pools.go", - "ingress.go", "limit_range.go", "network_partition.go", - "no-snat.go", "pod_gc.go", "podpreset.go", "pods.go", "pre_stop.go", "resource_quota.go", "service_accounts.go", - "service_latency.go", - "serviceloadbalancers.go", "ssh.go", "ubernetes_lite.go", ], @@ -121,10 +117,8 @@ go_library( "//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/certificates/v1beta1:go_default_library", - "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/cert:go_default_library", - "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", ], ) diff --git a/test/e2e/network/BUILD b/test/e2e/network/BUILD index f638896ddd6..4d33ef3873b 100644 --- a/test/e2e/network/BUILD +++ b/test/e2e/network/BUILD @@ -16,15 +16,20 @@ go_library( "doc.go", "firewall.go", "framework.go", + "ingress.go", "kube_proxy.go", "network_policy.go", "networking.go", "networking_perf.go", + "no_snat.go", "service.go", + "service_latency.go", + "serviceloadbalancers.go", "util_iperf.go", ], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1/service:go_default_library", "//pkg/apis/networking:go_default_library", @@ -35,18 +40,28 @@ go_library( "//pkg/kubelet/apis:go_default_library", "//pkg/master/ports:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/manifest:go_default_library", "//test/images/net/nat:go_default_library", + "//test/utils:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/api/rbac/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", + "//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/rest:go_default_library", + "//vendor/k8s.io/client-go/tools/cache:go_default_library", + "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", ], ) diff --git a/test/e2e/ingress.go b/test/e2e/network/ingress.go similarity index 97% rename from test/e2e/ingress.go rename to test/e2e/network/ingress.go index 0b21bc030e2..14bed30dbe4 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/network/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "fmt" @@ -30,7 +30,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("Loadbalancing: L7", func() { +var _ = SIGDescribe("Loadbalancing: L7", func() { defer GinkgoRecover() var ( ns string @@ -64,7 +64,7 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() { // // Slow by design ~10m for each "It" block dominated by loadbalancer setup time // TODO: write similar tests for nginx, haproxy and AWS Ingress. - framework.KubeDescribe("GCE [Slow] [Feature:Ingress]", func() { + SIGDescribe("GCE [Slow] [Feature:Ingress]", func() { var gceController *framework.GCEIngressController // Platform specific setup @@ -151,7 +151,7 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() { }) // Time: borderline 5m, slow by design - framework.KubeDescribe("[Slow] Nginx", func() { + SIGDescribe("[Slow] Nginx", func() { var nginxController *framework.NginxIngressController BeforeEach(func() { diff --git a/test/e2e/no-snat.go b/test/e2e/network/no_snat.go similarity index 98% rename from test/e2e/no-snat.go rename to test/e2e/network/no_snat.go index 40cf4a4e07c..24e315e483b 100644 --- a/test/e2e/no-snat.go +++ b/test/e2e/network/no_snat.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "fmt" @@ -131,7 +131,7 @@ func checknosnatURL(proxy, pip string, ips []string) string { // 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 _ = framework.KubeDescribe("NoSNAT [Feature:NoSNAT] [Slow]", func() { +var _ = SIGDescribe("NoSNAT [Feature:NoSNAT] [Slow]", func() { f := framework.NewDefaultFramework("no-snat-test") It("Should be able to send traffic between Pods without SNAT", func() { cs := f.ClientSet diff --git a/test/e2e/service_latency.go b/test/e2e/network/service_latency.go similarity index 99% rename from test/e2e/service_latency.go rename to test/e2e/network/service_latency.go index e11867d99e0..70bdf289f46 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/network/service_latency.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "fmt" @@ -42,7 +42,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 _ = framework.KubeDescribe("Service endpoints latency", func() { +var _ = SIGDescribe("Service endpoints latency", func() { f := framework.NewDefaultFramework("svc-latency") It("should not be very high [Conformance]", func() { diff --git a/test/e2e/serviceloadbalancers.go b/test/e2e/network/serviceloadbalancers.go similarity index 98% rename from test/e2e/serviceloadbalancers.go rename to test/e2e/network/serviceloadbalancers.go index 0c37370d1c1..a70d01fd913 100644 --- a/test/e2e/serviceloadbalancers.go +++ b/test/e2e/network/serviceloadbalancers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "fmt" @@ -213,7 +213,7 @@ func (s *ingManager) test(path string) error { }) } -var _ = framework.KubeDescribe("ServiceLoadBalancer [Feature:ServiceLoadBalancer]", func() { +var _ = SIGDescribe("ServiceLoadBalancer [Feature:ServiceLoadBalancer]", func() { // These variables are initialized after framework's beforeEach. var ns string var client clientset.Interface