diff --git a/test/e2e_federation/BUILD b/federation/test/e2e/BUILD similarity index 100% rename from test/e2e_federation/BUILD rename to federation/test/e2e/BUILD diff --git a/test/e2e_federation/OWNERS b/federation/test/e2e/OWNERS similarity index 100% rename from test/e2e_federation/OWNERS rename to federation/test/e2e/OWNERS diff --git a/federation/test/e2e/README.md b/federation/test/e2e/README.md new file mode 100644 index 00000000000..ff69219ac5d --- /dev/null +++ b/federation/test/e2e/README.md @@ -0,0 +1 @@ +See [e2e-tests](https://git.k8s.io/community/contributors/devel/e2e-tests.md#federation-e2e-tests) diff --git a/test/e2e_federation/apiserver.go b/federation/test/e2e/apiserver.go similarity index 98% rename from test/e2e_federation/apiserver.go rename to federation/test/e2e/apiserver.go index 50de3c1c350..f46a34de3a3 100644 --- a/test/e2e_federation/apiserver.go +++ b/federation/test/e2e/apiserver.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -23,8 +23,8 @@ import ( . "github.com/onsi/gomega" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" ) // Create/delete cluster api objects diff --git a/test/e2e_federation/authn.go b/federation/test/e2e/authn.go similarity index 98% rename from test/e2e_federation/authn.go rename to federation/test/e2e/authn.go index ee55ddbddfb..bf8f94dbbd2 100644 --- a/test/e2e_federation/authn.go +++ b/federation/test/e2e/authn.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/tools/clientcmd" "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e_federation/crud.go b/federation/test/e2e/crud.go similarity index 95% rename from test/e2e_federation/crud.go rename to federation/test/e2e/crud.go index 91d534a227b..a7b3a94b4d0 100644 --- a/test/e2e_federation/crud.go +++ b/federation/test/e2e/crud.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -23,8 +23,8 @@ import ( kubeclientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/federation/pkg/federatedtypes" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" ) var _ = framework.KubeDescribe("Federated types [Feature:Federation][Experimental] ", func() { diff --git a/test/e2e_federation/event.go b/federation/test/e2e/event.go similarity index 97% rename from test/e2e_federation/event.go rename to federation/test/e2e/event.go index 6b7da0528a9..00328c5b716 100644 --- a/test/e2e_federation/event.go +++ b/federation/test/e2e/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/gomega" ) diff --git a/test/e2e_federation/framework/BUILD b/federation/test/e2e/framework/BUILD similarity index 100% rename from test/e2e_federation/framework/BUILD rename to federation/test/e2e/framework/BUILD diff --git a/test/e2e_federation/framework/cluster.go b/federation/test/e2e/framework/cluster.go similarity index 100% rename from test/e2e_federation/framework/cluster.go rename to federation/test/e2e/framework/cluster.go diff --git a/test/e2e_federation/framework/crudtester.go b/federation/test/e2e/framework/crudtester.go similarity index 100% rename from test/e2e_federation/framework/crudtester.go rename to federation/test/e2e/framework/crudtester.go diff --git a/test/e2e_federation/framework/framework.go b/federation/test/e2e/framework/framework.go similarity index 100% rename from test/e2e_federation/framework/framework.go rename to federation/test/e2e/framework/framework.go diff --git a/test/e2e_federation/framework/util.go b/federation/test/e2e/framework/util.go similarity index 100% rename from test/e2e_federation/framework/util.go rename to federation/test/e2e/framework/util.go diff --git a/test/e2e_federation/ingress.go b/federation/test/e2e/ingress.go similarity index 99% rename from test/e2e_federation/ingress.go rename to federation/test/e2e/ingress.go index 8782792c1cf..9ae324fc7ad 100644 --- a/test/e2e_federation/ingress.go +++ b/federation/test/e2e/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "crypto/tls" @@ -37,8 +37,8 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e_federation/job.go b/federation/test/e2e/job.go similarity index 99% rename from test/e2e_federation/job.go rename to federation/test/e2e/job.go index 3cbe6d315fc..023daeebd79 100644 --- a/test/e2e_federation/job.go +++ b/federation/test/e2e/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" diff --git a/test/e2e_federation/namespace.go b/federation/test/e2e/namespace.go similarity index 98% rename from test/e2e_federation/namespace.go rename to federation/test/e2e/namespace.go index 7b7636d5dbd..de9aa81c18d 100644 --- a/test/e2e_federation/namespace.go +++ b/federation/test/e2e/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e_federation/replicaset.go b/federation/test/e2e/replicaset.go similarity index 99% rename from test/e2e_federation/replicaset.go rename to federation/test/e2e/replicaset.go index 6df94ee85e3..7a307fb95f6 100644 --- a/test/e2e_federation/replicaset.go +++ b/federation/test/e2e/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "encoding/json" @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e_federation/service.go b/federation/test/e2e/service.go similarity index 99% rename from test/e2e_federation/service.go rename to federation/test/e2e/service.go index 4b54eb44f75..5703e9be3d2 100644 --- a/test/e2e_federation/service.go +++ b/federation/test/e2e/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -29,8 +29,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e_federation/upgrade.go b/federation/test/e2e/upgrade.go similarity index 96% rename from test/e2e_federation/upgrade.go rename to federation/test/e2e/upgrade.go index 677f837afec..e7606862100 100644 --- a/test/e2e_federation/upgrade.go +++ b/federation/test/e2e/upgrade.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" + "k8s.io/kubernetes/federation/test/e2e/upgrades" "k8s.io/kubernetes/test/e2e/chaosmonkey" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" - "k8s.io/kubernetes/test/e2e_federation/upgrades" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e_federation/upgrades/BUILD b/federation/test/e2e/upgrades/BUILD similarity index 100% rename from test/e2e_federation/upgrades/BUILD rename to federation/test/e2e/upgrades/BUILD diff --git a/test/e2e_federation/upgrades/simple.go b/federation/test/e2e/upgrades/simple.go similarity index 97% rename from test/e2e_federation/upgrades/simple.go rename to federation/test/e2e/upgrades/simple.go index 6516ecd204f..880b6edced7 100644 --- a/test/e2e_federation/upgrades/simple.go +++ b/federation/test/e2e/upgrades/simple.go @@ -22,7 +22,7 @@ import ( pkgruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/federation/pkg/federatedtypes" crudtester "k8s.io/kubernetes/federation/pkg/federatedtypes/crudtester" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e_federation/upgrades/upgrade.go b/federation/test/e2e/upgrades/upgrade.go similarity index 96% rename from test/e2e_federation/upgrades/upgrade.go rename to federation/test/e2e/upgrades/upgrade.go index de9327c7736..e2c9bb911d4 100644 --- a/test/e2e_federation/upgrades/upgrade.go +++ b/federation/test/e2e/upgrades/upgrade.go @@ -18,7 +18,7 @@ limitations under the License. // features before, during, and after different types of upgrades. package upgrades -import fedframework "k8s.io/kubernetes/test/e2e_federation/framework" +import fedframework "k8s.io/kubernetes/federation/test/e2e/framework" // FederationUpgradeType represents different types of federation upgrades. type FederationUpgradeType int diff --git a/test/e2e_federation/util.go b/federation/test/e2e/util.go similarity index 99% rename from test/e2e_federation/util.go rename to federation/test/e2e/util.go index a1ed132ac5a..f30d039455a 100644 --- a/test/e2e_federation/util.go +++ b/federation/test/e2e/util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e_federation +package e2e import ( "fmt" @@ -29,10 +29,10 @@ import ( kubeclientset "k8s.io/client-go/kubernetes" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" + fedframework "k8s.io/kubernetes/federation/test/e2e/framework" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" - fedframework "k8s.io/kubernetes/test/e2e_federation/framework" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/hack/.golint_failures b/hack/.golint_failures index bae37c3f751..7b5ee53c8c6 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -59,6 +59,9 @@ federation/pkg/kubefed/testing federation/pkg/kubefed/util federation/registry/cluster federation/registry/cluster/etcd +federation/test/e2e +federation/test/e2e/framework +federation/test/e2e/upgrades pkg/api/endpoints pkg/api/helper pkg/api/helper/qos @@ -791,9 +794,6 @@ test/e2e/storage test/e2e/upgrades test/e2e/upgrades/apps test/e2e/upgrades/storage -test/e2e_federation -test/e2e_federation/framework -test/e2e_federation/upgrades test/e2e_node test/e2e_node/builder test/e2e_node/environment diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 43308a3ef85..00e1d561daa 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -34,6 +34,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeutils "k8s.io/apimachinery/pkg/util/runtime" clientset "k8s.io/client-go/kubernetes" + federationtest "k8s.io/kubernetes/federation/test/e2e" "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" "k8s.io/kubernetes/pkg/kubectl/util/logs" @@ -42,7 +43,6 @@ import ( "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" "k8s.io/kubernetes/test/e2e/framework/metrics" "k8s.io/kubernetes/test/e2e/manifest" - federationtest "k8s.io/kubernetes/test/e2e_federation" testutils "k8s.io/kubernetes/test/utils" ) diff --git a/test/e2e_federation/README.md b/test/e2e_federation/README.md deleted file mode 100644 index 33a4d01f866..00000000000 --- a/test/e2e_federation/README.md +++ /dev/null @@ -1,3 +0,0 @@ -See [e2e-tests](https://git.k8s.io/community/contributors/devel/e2e-tests.md#federation-e2e-tests) - -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/e2e_federation//README.md?pixel)]()