From 674e539fcad564cdd18a965115e1b12b9f402931 Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Mon, 2 Mar 2020 15:38:56 -0500 Subject: [PATCH] test/e2e/framework: remove dependencies to internal APIs Signed-off-by: andrewsykim --- test/e2e/framework/autoscaling/BUILD | 1 - .../autoscaling/autoscaling_utils.go | 3 +-- test/e2e/framework/metrics/BUILD | 1 - test/e2e/framework/metrics/metrics_grabber.go | 3 +-- test/e2e/framework/rc/BUILD | 2 +- test/e2e/framework/rc/rc_utils.go | 6 ++--- test/e2e/framework/resource/BUILD | 4 ---- test/e2e/framework/resource/runtimeobj.go | 24 ++++++++++++------- 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/test/e2e/framework/autoscaling/BUILD b/test/e2e/framework/autoscaling/BUILD index d85a0decf92..1f279ce7d0e 100644 --- a/test/e2e/framework/autoscaling/BUILD +++ b/test/e2e/framework/autoscaling/BUILD @@ -6,7 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/autoscaling", visibility = ["//visibility:public"], deps = [ - "//pkg/apis/core:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/framework/autoscaling/autoscaling_utils.go b/test/e2e/framework/autoscaling/autoscaling_utils.go index 02787bff004..2d3e1fa8fb1 100644 --- a/test/e2e/framework/autoscaling/autoscaling_utils.go +++ b/test/e2e/framework/autoscaling/autoscaling_utils.go @@ -30,7 +30,6 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/test/e2e/framework" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" e2erc "k8s.io/kubernetes/test/e2e/framework/rc" @@ -417,7 +416,7 @@ func (rc *ResourceConsumer) CleanUp() { kind := rc.kind.GroupKind() framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, kind, rc.nsName, rc.name)) framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(context.TODO(), rc.name, nil)) - framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, api.Kind("ReplicationController"), rc.nsName, rc.controllerName)) + framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, schema.GroupKind{Kind: "ReplicationController"}, rc.nsName, rc.controllerName)) framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(context.TODO(), rc.controllerName, nil)) } diff --git a/test/e2e/framework/metrics/BUILD b/test/e2e/framework/metrics/BUILD index 3713c9f49f3..081ec489116 100644 --- a/test/e2e/framework/metrics/BUILD +++ b/test/e2e/framework/metrics/BUILD @@ -22,7 +22,6 @@ go_library( ], importpath = "k8s.io/kubernetes/test/e2e/framework/metrics", deps = [ - "//pkg/apis/core:go_default_library", "//pkg/kubelet/dockershim/metrics:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/master/ports:go_default_library", diff --git a/test/e2e/framework/metrics/metrics_grabber.go b/test/e2e/framework/metrics/metrics_grabber.go index c1e46264002..fdfd51f9997 100644 --- a/test/e2e/framework/metrics/metrics_grabber.go +++ b/test/e2e/framework/metrics/metrics_grabber.go @@ -23,7 +23,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" clientset "k8s.io/client-go/kubernetes" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/test/e2e/system" @@ -101,7 +100,7 @@ func (g *Grabber) HasRegisteredMaster() bool { // GrabFromKubelet returns metrics from kubelet func (g *Grabber) GrabFromKubelet(nodeName string) (KubeletMetrics, error) { - nodes, err := g.client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{FieldSelector: fields.Set{api.ObjectNameField: nodeName}.AsSelector().String()}) + nodes, err := g.client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{FieldSelector: fields.Set{"metadata.name": nodeName}.AsSelector().String()}) if err != nil { return KubeletMetrics{}, err } diff --git a/test/e2e/framework/rc/BUILD b/test/e2e/framework/rc/BUILD index 964d7a8dea2..b912c38b5f1 100644 --- a/test/e2e/framework/rc/BUILD +++ b/test/e2e/framework/rc/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/rc", visibility = ["//visibility:public"], deps = [ - "//pkg/apis/core:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//test/e2e/framework:go_default_library", diff --git a/test/e2e/framework/rc/rc_utils.go b/test/e2e/framework/rc/rc_utils.go index 9531ae9cfc2..5dff022b0cb 100644 --- a/test/e2e/framework/rc/rc_utils.go +++ b/test/e2e/framework/rc/rc_utils.go @@ -23,9 +23,9 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" clientset "k8s.io/client-go/kubernetes" scaleclient "k8s.io/client-go/scale" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/test/e2e/framework" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" testutils "k8s.io/kubernetes/test/utils" @@ -70,12 +70,12 @@ func ByNameContainer(name string, replicas int32, labels map[string]string, c v1 // DeleteRCAndWaitForGC deletes only the Replication Controller and waits for GC to delete the pods. func DeleteRCAndWaitForGC(c clientset.Interface, ns, name string) error { - return framework.DeleteResourceAndWaitForGC(c, api.Kind("ReplicationController"), ns, name) + return framework.DeleteResourceAndWaitForGC(c, schema.GroupKind{Kind: "ReplicationController"}, ns, name) } // ScaleRC scales Replication Controller to be desired size. func ScaleRC(clientset clientset.Interface, scalesGetter scaleclient.ScalesGetter, ns, name string, size uint, wait bool) error { - return framework.ScaleResource(clientset, scalesGetter, ns, name, size, wait, api.Kind("ReplicationController"), api.SchemeGroupVersion.WithResource("replicationcontrollers")) + return framework.ScaleResource(clientset, scalesGetter, ns, name, size, wait, schema.GroupKind{Kind: "ReplicationController"}, v1.SchemeGroupVersion.WithResource("replicationcontrollers")) } // RunRC Launches (and verifies correctness) of a Replication Controller diff --git a/test/e2e/framework/resource/BUILD b/test/e2e/framework/resource/BUILD index 6f0409cdb02..9166ec3eef3 100644 --- a/test/e2e/framework/resource/BUILD +++ b/test/e2e/framework/resource/BUILD @@ -6,10 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/resource", visibility = ["//visibility:public"], deps = [ - "//pkg/apis/apps:go_default_library", - "//pkg/apis/batch:go_default_library", - "//pkg/apis/core:go_default_library", - "//pkg/apis/extensions:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/e2e/framework/resource/runtimeobj.go b/test/e2e/framework/resource/runtimeobj.go index 7bfacbccfc4..4d498eb31f3 100644 --- a/test/e2e/framework/resource/runtimeobj.go +++ b/test/e2e/framework/resource/runtimeobj.go @@ -29,25 +29,31 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" clientset "k8s.io/client-go/kubernetes" - appsinternal "k8s.io/kubernetes/pkg/apis/apps" - batchinternal "k8s.io/kubernetes/pkg/apis/batch" - api "k8s.io/kubernetes/pkg/apis/core" - extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" +) + +var ( + kindReplicationController = schema.GroupKind{Kind: "ReplicationController"} + kindExtensionsReplicaSet = schema.GroupKind{Group: "extensions", Kind: "ReplicaSet"} + kindAppsReplicaSet = schema.GroupKind{Group: "apps", Kind: "ReplicaSet"} + kindExtensionsDeployment = schema.GroupKind{Group: "extensions", Kind: "Deployment"} + kindAppsDeployment = schema.GroupKind{Group: "apps", Kind: "Deployment"} + kindExtensionsDaemonSet = schema.GroupKind{Group: "extensions", Kind: "DaemonSet"} + kindBatchJob = schema.GroupKind{Group: "batch", Kind: "Job"} ) // GetRuntimeObjectForKind returns a runtime.Object based on its GroupKind, // namespace and name. func GetRuntimeObjectForKind(c clientset.Interface, kind schema.GroupKind, ns, name string) (runtime.Object, error) { switch kind { - case api.Kind("ReplicationController"): + case kindReplicationController: return c.CoreV1().ReplicationControllers(ns).Get(context.TODO(), name, metav1.GetOptions{}) - case extensionsinternal.Kind("ReplicaSet"), appsinternal.Kind("ReplicaSet"): + case kindExtensionsReplicaSet, kindAppsReplicaSet: return c.AppsV1().ReplicaSets(ns).Get(context.TODO(), name, metav1.GetOptions{}) - case extensionsinternal.Kind("Deployment"), appsinternal.Kind("Deployment"): + case kindExtensionsDeployment, kindAppsDeployment: return c.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{}) - case extensionsinternal.Kind("DaemonSet"): + case kindExtensionsDaemonSet: return c.AppsV1().DaemonSets(ns).Get(context.TODO(), name, metav1.GetOptions{}) - case batchinternal.Kind("Job"): + case kindBatchJob: return c.BatchV1().Jobs(ns).Get(context.TODO(), name, metav1.GetOptions{}) default: return nil, fmt.Errorf("Unsupported kind when getting runtime object: %v", kind)