diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 68dba97fb2c..7a9fccd9bb8 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -76,7 +76,6 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//test/e2e/framework:go_default_library", - "//test/e2e/framework/deployment:go_default_library", "//test/e2e/framework/kubelet:go_default_library", "//test/e2e/framework/log:go_default_library", "//test/e2e/framework/node:go_default_library", diff --git a/test/e2e/common/autoscaling_utils.go b/test/e2e/common/autoscaling_utils.go index 6847c1dc4bb..cbc7c860c6b 100644 --- a/test/e2e/common/autoscaling_utils.go +++ b/test/e2e/common/autoscaling_utils.go @@ -32,7 +32,6 @@ import ( clientset "k8s.io/client-go/kubernetes" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/test/e2e/framework" - e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment" e2elog "k8s.io/kubernetes/test/e2e/framework/log" "k8s.io/kubernetes/test/e2e/framework/replicaset" e2eservice "k8s.io/kubernetes/test/e2e/framework/service" @@ -479,7 +478,7 @@ func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, ns, name st dpConfig := testutils.DeploymentConfig{ RCConfig: rcConfig, } - framework.ExpectNoError(e2edeploy.RunDeployment(dpConfig)) + framework.ExpectNoError(runDeployment(dpConfig)) break case KindReplicaSet: rsConfig := testutils.ReplicaSetConfig{ @@ -554,3 +553,11 @@ func CreateCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu, minReplicas, ma func DeleteHorizontalPodAutoscaler(rc *ResourceConsumer, autoscalerName string) { rc.clientSet.AutoscalingV1().HorizontalPodAutoscalers(rc.nsName).Delete(autoscalerName, nil) } + +// runDeployment runs a delopyment with the specified config. +func runDeployment(config testutils.DeploymentConfig) error { + ginkgo.By(fmt.Sprintf("creating deployment %s in namespace %s", config.Name, config.Namespace)) + config.NodeDumpFunc = framework.DumpNodeDebugInfo + config.ContainerDumpFunc = framework.LogFailedContainers + return testutils.RunDeployment(config) +} diff --git a/test/e2e/framework/deployment/BUILD b/test/e2e/framework/deployment/BUILD index 47a425c3f15..152523248f1 100644 --- a/test/e2e/framework/deployment/BUILD +++ b/test/e2e/framework/deployment/BUILD @@ -20,11 +20,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", - "//test/e2e/framework:go_default_library", "//test/e2e/framework/log:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", - "//vendor/github.com/onsi/ginkgo:go_default_library", ], ) diff --git a/test/e2e/framework/deployment/fixtures.go b/test/e2e/framework/deployment/fixtures.go index dbdaab66222..9369625a5f2 100644 --- a/test/e2e/framework/deployment/fixtures.go +++ b/test/e2e/framework/deployment/fixtures.go @@ -21,8 +21,6 @@ import ( "fmt" "time" - "github.com/onsi/ginkgo" - appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -32,7 +30,6 @@ import ( clientset "k8s.io/client-go/kubernetes" watchtools "k8s.io/client-go/tools/watch" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" - "k8s.io/kubernetes/test/e2e/framework" e2elog "k8s.io/kubernetes/test/e2e/framework/log" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" @@ -159,14 +156,6 @@ func GetPodsForDeployment(client clientset.Interface, deployment *appsv1.Deploym return podList, nil } -// RunDeployment runs a delopyment with the specified config. -func RunDeployment(config testutils.DeploymentConfig) error { - ginkgo.By(fmt.Sprintf("creating deployment %s in namespace %s", config.Name, config.Namespace)) - config.NodeDumpFunc = framework.DumpNodeDebugInfo - config.ContainerDumpFunc = framework.LogFailedContainers - return testutils.RunDeployment(config) -} - // testDeployment creates a deployment definition based on the namespace. The deployment references the PVC's // name. A slice of BASH commands can be supplied as args to be run by the pod func testDeployment(replicas int32, podLabels map[string]string, nodeSelector map[string]string, namespace string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) *appsv1.Deployment {