Merge pull request kubernetes#85230 from oomichi/add-todo-issue81245

k8s-ci-robot · web-flow · commit 97225e2742f4 · 2019-11-14T13:31:41.000-08:00
Add TODOs for removing invalid e2e dependencies
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -70,14 +70,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 (

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`	`"strings"`
`23`	`23`
	`24`	`+ // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)`
`24`	`25`	`e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"`
`25`	`26`	`)`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"github.com/onsi/ginkgo"`
`27`	`27`
	`28`	`+ // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)`
`28`	`29`	`"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"`
`29`	`30`	`)`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ import (`
`26`	`26`	`"time"`
`27`	`27`
`28`	`28`	`clientset "k8s.io/client-go/kubernetes"`
	`29`	`+`
	`30`	`+ // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)`
`29`	`31`	`e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"`
`30`	`32`	`)`
`31`	`33`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ import (`
`28`	`28`	`v1 "k8s.io/api/core/v1"`
`29`	`29`	`"k8s.io/apimachinery/pkg/util/wait"`
`30`	`30`	`clientset "k8s.io/client-go/kubernetes"`
	`31`	`+`
	`32`	`+ // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)`
`31`	`33`	`e2enode "k8s.io/kubernetes/test/e2e/framework/node"`
`32`	`34`	`e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"`
`33`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"sync"`
`27`	`27`	`"time"`
`28`	`28`
	`29`	`+ // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)`
`29`	`30`	`e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"`
`30`	`31`	`)`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"path"`
`23`	`23`	`"time"`
`24`	`24`
	`25`	`+ // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)`
`25`	`26`	`e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"`
`26`	`27`	`)`
`27`	`28`