From 8f32ee183f7ba35ea6f262912d049fdaf6fae1f4 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Wed, 13 Nov 2019 19:34:08 +0000 Subject: [PATCH] Add TODOs for removing invalid e2e dependencies The e2e core framework and subpackages of e2e framework are defined. The subpackages can import the core framework, but the core framework should not import the subpackages. We've defined this dependency rule after circular depencency issue happened. This adds TODOs to understand what we should in this rule. --- test/e2e/framework/framework.go | 8 +++++--- test/e2e/framework/get-kubemark-resource-usage.go | 1 + test/e2e/framework/log.go | 1 + test/e2e/framework/log_size_monitoring.go | 2 ++ test/e2e/framework/nodes_util.go | 2 ++ test/e2e/framework/pods.go | 4 +++- test/e2e/framework/profile_gatherer.go | 1 + test/e2e/framework/psp.go | 4 +++- test/e2e/framework/skip.go | 2 ++ test/e2e/framework/suites.go | 1 + test/e2e/framework/util.go | 8 +++++--- 11 files changed, 26 insertions(+), 8 deletions(-) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 38c53da9685..a0343f2ce10 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -46,13 +46,15 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/restmapper" scaleclient "k8s.io/client-go/scale" - e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics" - e2enode "k8s.io/kubernetes/test/e2e/framework/node" - e2epod "k8s.io/kubernetes/test/e2e/framework/pod" testutils "k8s.io/kubernetes/test/utils" "github.com/onsi/ginkgo" "github.com/onsi/gomega" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) + e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics" + e2enode "k8s.io/kubernetes/test/e2e/framework/node" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" ) const ( diff --git a/test/e2e/framework/get-kubemark-resource-usage.go b/test/e2e/framework/get-kubemark-resource-usage.go index 58385c59070..f9b60a32db6 100644 --- a/test/e2e/framework/get-kubemark-resource-usage.go +++ b/test/e2e/framework/get-kubemark-resource-usage.go @@ -21,6 +21,7 @@ import ( "fmt" "strings" + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) diff --git a/test/e2e/framework/log.go b/test/e2e/framework/log.go index 845e0a7cb16..8f0e66b1cfb 100644 --- a/test/e2e/framework/log.go +++ b/test/e2e/framework/log.go @@ -25,6 +25,7 @@ import ( "github.com/onsi/ginkgo" + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" ) diff --git a/test/e2e/framework/log_size_monitoring.go b/test/e2e/framework/log_size_monitoring.go index 4bfdaf9a60a..e033f5dec90 100644 --- a/test/e2e/framework/log_size_monitoring.go +++ b/test/e2e/framework/log_size_monitoring.go @@ -26,6 +26,8 @@ import ( "time" clientset "k8s.io/client-go/kubernetes" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 9b2665b2dbc..56edc86f576 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -28,6 +28,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) diff --git a/test/e2e/framework/pods.go b/test/e2e/framework/pods.go index 3bbf6bdb6c2..dcfc122cc29 100644 --- a/test/e2e/framework/pods.go +++ b/test/e2e/framework/pods.go @@ -33,10 +33,12 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/sysctl" - e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "github.com/onsi/ginkgo" "github.com/onsi/gomega" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" ) // DefaultPodDeletionTimeout is the default timeout for deleting pod diff --git a/test/e2e/framework/profile_gatherer.go b/test/e2e/framework/profile_gatherer.go index 6ba8a48686e..36d656e456a 100644 --- a/test/e2e/framework/profile_gatherer.go +++ b/test/e2e/framework/profile_gatherer.go @@ -26,6 +26,7 @@ import ( "sync" "time" + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) diff --git a/test/e2e/framework/psp.go b/test/e2e/framework/psp.go index 94d788533b0..06210c668d2 100644 --- a/test/e2e/framework/psp.go +++ b/test/e2e/framework/psp.go @@ -29,9 +29,11 @@ import ( "k8s.io/apiserver/pkg/authentication/serviceaccount" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" - "k8s.io/kubernetes/test/e2e/framework/auth" "github.com/onsi/ginkgo" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) + "k8s.io/kubernetes/test/e2e/framework/auth" ) const ( diff --git a/test/e2e/framework/skip.go b/test/e2e/framework/skip.go index 631fc51deb8..02b131c18a0 100644 --- a/test/e2e/framework/skip.go +++ b/test/e2e/framework/skip.go @@ -28,6 +28,8 @@ import ( "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/features" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) diff --git a/test/e2e/framework/suites.go b/test/e2e/framework/suites.go index 68a2168a49e..b189b87cf02 100644 --- a/test/e2e/framework/suites.go +++ b/test/e2e/framework/suites.go @@ -22,6 +22,7 @@ import ( "path" "time" + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics" ) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 452e0e91512..a3d69713fda 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -71,14 +71,16 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/master/ports" taintutils "k8s.io/kubernetes/pkg/util/taints" + testutils "k8s.io/kubernetes/test/utils" + imageutils "k8s.io/kubernetes/test/utils/image" + uexec "k8s.io/utils/exec" + + // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eresource "k8s.io/kubernetes/test/e2e/framework/resource" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" - testutils "k8s.io/kubernetes/test/utils" - imageutils "k8s.io/kubernetes/test/utils/image" - uexec "k8s.io/utils/exec" ) const (