From 92a8c1fcb0b61082169c4e6478fe2644024a5c4d Mon Sep 17 00:00:00 2001 From: Bowei Du Date: Mon, 10 Jul 2017 23:44:46 -0700 Subject: [PATCH] Moves networking e2e tests to test/e2e/network This also adds sig-network-{approvers,reviewers} alias --- OWNERS_ALIASES | 24 ++++++--- hack/.golint_failures | 1 + test/e2e/BUILD | 21 ++------ test/e2e/e2e_test.go | 1 + test/e2e/network/BUILD | 63 +++++++++++++++++++++++ test/e2e/network/OWNERS | 4 ++ test/e2e/{ => network}/dns.go | 2 +- test/e2e/{ => network}/dns_common.go | 2 +- test/e2e/{ => network}/dns_configmap.go | 2 +- test/e2e/network/doc.go | 18 +++++++ test/e2e/{ => network}/firewall.go | 2 +- test/e2e/{ => network}/kube_proxy.go | 2 +- test/e2e/{ => network}/network_policy.go | 2 +- test/e2e/{ => network}/networking.go | 2 +- test/e2e/{ => network}/networking_perf.go | 2 +- test/e2e/{ => network}/service.go | 2 +- test/e2e/{ => network}/util_iperf.go | 2 +- 17 files changed, 119 insertions(+), 33 deletions(-) create mode 100644 test/e2e/network/BUILD create mode 100644 test/e2e/network/OWNERS rename test/e2e/{ => network}/dns.go (99%) rename test/e2e/{ => network}/dns_common.go (99%) rename test/e2e/{ => network}/dns_configmap.go (99%) create mode 100644 test/e2e/network/doc.go rename test/e2e/{ => network}/firewall.go (99%) rename test/e2e/{ => network}/kube_proxy.go (99%) rename test/e2e/{ => network}/network_policy.go (99%) rename test/e2e/{ => network}/networking.go (99%) rename test/e2e/{ => network}/networking_perf.go (99%) rename test/e2e/{ => network}/service.go (99%) rename test/e2e/{ => network}/util_iperf.go (99%) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index bd6d3efc278..ba264d33799 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -58,14 +58,26 @@ aliases: - vishh - yifan-gu - yujuhong - sig-network-reviewers: - - thockin - - freehan + sig-network-approvers: - bowei - - mrhohn - - dcbw - - danwinship - caseydavenport + - danwinship + - dcbw + - dnardo + - freehan + - mrhohn + - nicksardo + - thockin + sig-network-reviewers: + - bowei + - caseydavenport + - danwinship + - dcbw + - dnardo + - freehan + - mrhohn + - nicksardo + - thockin sig-apps-reviewers: - enisoc - erictune diff --git a/hack/.golint_failures b/hack/.golint_failures index bf57cb6e3dd..a1a600f1857 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -813,6 +813,7 @@ test/e2e/kubectl test/e2e/lifecycle test/e2e/lifecycle/bootstrap test/e2e/metrics +test/e2e/network test/e2e/scalability test/e2e/scheduling test/e2e/storage diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 2fdf39fe160..062b7bed20d 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -28,6 +28,7 @@ go_test( "//test/e2e/lifecycle:go_default_library", "//test/e2e/lifecycle/bootstrap:go_default_library", "//test/e2e/metrics:go_default_library", + "//test/e2e/network:go_default_library", "//test/e2e/scalability:go_default_library", "//test/e2e/scheduling:go_default_library", "//test/e2e/storage:go_default_library", @@ -52,26 +53,18 @@ go_library( "audit.go", "certificates.go", "dashboard.go", - "dns.go", - "dns_common.go", - "dns_configmap.go", "e2e.go", "events.go", "example_cluster_dns.go", "examples.go", - "firewall.go", "generated_clientset.go", "gke_local_ssd.go", "gke_node_pools.go", "ingress.go", - "kube_proxy.go", "kubelet.go", "kubelet_perf.go", "limit_range.go", "network_partition.go", - "network_policy.go", - "networking.go", - "networking_perf.go", "no-snat.go", "nodeoutofdisk.go", "pod_gc.go", @@ -80,30 +73,22 @@ go_library( "pre_stop.go", "resource_quota.go", "security_context.go", - "service.go", "service_accounts.go", "service_latency.go", "serviceloadbalancers.go", "ssh.go", "ubernetes_lite.go", - "util_iperf.go", ], tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1/pod:go_default_library", - "//pkg/api/v1/service:go_default_library", - "//pkg/apis/networking:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/cloudprovider/providers/gce:go_default_library", - "//pkg/controller/endpoint:go_default_library", "//pkg/controller/node:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/quota/evaluator/core:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/util/version:go_default_library", @@ -115,7 +100,6 @@ go_library( "//test/e2e/manifest:go_default_library", "//test/e2e/metrics:go_default_library", "//test/e2e_federation:go_default_library", - "//test/images/net/nat:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", @@ -152,6 +136,8 @@ go_library( ], ) +# This is a handwritten rule. Do not delete, it will not be regenerated by +# update-bazel.sh. genrule( name = "gen_e2e.test", testonly = 1, @@ -184,6 +170,7 @@ filegroup( "//test/e2e/lifecycle:all-srcs", "//test/e2e/manifest:all-srcs", "//test/e2e/metrics:all-srcs", + "//test/e2e/network:all-srcs", "//test/e2e/perftype:all-srcs", "//test/e2e/scalability:all-srcs", "//test/e2e/scheduling:all-srcs", diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index b76ce37fbc3..f6d2bb9c994 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -28,6 +28,7 @@ import ( _ "k8s.io/kubernetes/test/e2e/kubectl" _ "k8s.io/kubernetes/test/e2e/lifecycle" _ "k8s.io/kubernetes/test/e2e/lifecycle/bootstrap" + _ "k8s.io/kubernetes/test/e2e/network" _ "k8s.io/kubernetes/test/e2e/scalability" _ "k8s.io/kubernetes/test/e2e/scheduling" _ "k8s.io/kubernetes/test/e2e/storage" diff --git a/test/e2e/network/BUILD b/test/e2e/network/BUILD new file mode 100644 index 00000000000..ffcee05710e --- /dev/null +++ b/test/e2e/network/BUILD @@ -0,0 +1,63 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "dns.go", + "dns_common.go", + "dns_configmap.go", + "doc.go", + "firewall.go", + "kube_proxy.go", + "network_policy.go", + "networking.go", + "networking_perf.go", + "service.go", + "util_iperf.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api/testapi:go_default_library", + "//pkg/api/v1/service:go_default_library", + "//pkg/apis/networking:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", + "//pkg/cloudprovider:go_default_library", + "//pkg/cloudprovider/providers/gce:go_default_library", + "//pkg/controller/endpoint:go_default_library", + "//pkg/kubelet/apis:go_default_library", + "//pkg/master/ports:go_default_library", + "//test/e2e/framework:go_default_library", + "//test/images/net/nat: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/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/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/client-go/kubernetes:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/test/e2e/network/OWNERS b/test/e2e/network/OWNERS new file mode 100644 index 00000000000..064cbc393ef --- /dev/null +++ b/test/e2e/network/OWNERS @@ -0,0 +1,4 @@ +reviewers: + - sig-network-reviewers +approvers: + - sig-network-approvers diff --git a/test/e2e/dns.go b/test/e2e/network/dns.go similarity index 99% rename from test/e2e/dns.go rename to test/e2e/network/dns.go index 8f99ac9a801..10bd4ea0080 100644 --- a/test/e2e/dns.go +++ b/test/e2e/network/dns.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "context" diff --git a/test/e2e/dns_common.go b/test/e2e/network/dns_common.go similarity index 99% rename from test/e2e/dns_common.go rename to test/e2e/network/dns_common.go index e272dd6fe72..e2a7c17fef2 100644 --- a/test/e2e/dns_common.go +++ b/test/e2e/network/dns_common.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" diff --git a/test/e2e/dns_configmap.go b/test/e2e/network/dns_configmap.go similarity index 99% rename from test/e2e/dns_configmap.go rename to test/e2e/network/dns_configmap.go index 5a4737a12aa..b0d2019a4c1 100644 --- a/test/e2e/dns_configmap.go +++ b/test/e2e/network/dns_configmap.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" diff --git a/test/e2e/network/doc.go b/test/e2e/network/doc.go new file mode 100644 index 00000000000..46547151982 --- /dev/null +++ b/test/e2e/network/doc.go @@ -0,0 +1,18 @@ +/* +Copyright 2014 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 are the end-to-end tests for Kubernetes networking. +package network diff --git a/test/e2e/firewall.go b/test/e2e/network/firewall.go similarity index 99% rename from test/e2e/firewall.go rename to test/e2e/network/firewall.go index 3400053b077..9890dcd0df5 100644 --- a/test/e2e/firewall.go +++ b/test/e2e/network/firewall.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" diff --git a/test/e2e/kube_proxy.go b/test/e2e/network/kube_proxy.go similarity index 99% rename from test/e2e/kube_proxy.go rename to test/e2e/network/kube_proxy.go index d8f0839b664..efd9c606380 100644 --- a/test/e2e/kube_proxy.go +++ b/test/e2e/network/kube_proxy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "encoding/json" diff --git a/test/e2e/network_policy.go b/test/e2e/network/network_policy.go similarity index 99% rename from test/e2e/network_policy.go rename to test/e2e/network/network_policy.go index 02ce6b4091a..bc97be1693c 100644 --- a/test/e2e/network_policy.go +++ b/test/e2e/network/network_policy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "k8s.io/api/core/v1" diff --git a/test/e2e/networking.go b/test/e2e/network/networking.go similarity index 99% rename from test/e2e/networking.go rename to test/e2e/network/networking.go index 6a6b72710ba..354323a52a5 100644 --- a/test/e2e/networking.go +++ b/test/e2e/network/networking.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" diff --git a/test/e2e/networking_perf.go b/test/e2e/network/networking_perf.go similarity index 99% rename from test/e2e/networking_perf.go rename to test/e2e/network/networking_perf.go index e081652f711..2e8372614a9 100644 --- a/test/e2e/networking_perf.go +++ b/test/e2e/network/networking_perf.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network // Tests network performance using iperf or other containers. import ( diff --git a/test/e2e/service.go b/test/e2e/network/service.go similarity index 99% rename from test/e2e/service.go rename to test/e2e/network/service.go index 1d0c8001e99..22649f2d1ff 100644 --- a/test/e2e/service.go +++ b/test/e2e/network/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network import ( "bytes" diff --git a/test/e2e/util_iperf.go b/test/e2e/network/util_iperf.go similarity index 99% rename from test/e2e/util_iperf.go rename to test/e2e/network/util_iperf.go index 0e568a07783..f33d1888f46 100644 --- a/test/e2e/util_iperf.go +++ b/test/e2e/network/util_iperf.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package network // Tests network performance using iperf or other containers. import (