Skip to content

Commit 1c4f1ed

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#88746 from andrewsykim/test-framework-pkg-apis
test/e2e/framework: remove dependencies to internal APIs
2 parents eaceb7b + 674e539 commit 1c4f1ed

File tree

8 files changed

+21
-23
lines changed

8 files changed

+21
-23
lines changed

‎test/e2e/framework/autoscaling/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ go_library(
66
importpath = "k8s.io/kubernetes/test/e2e/framework/autoscaling",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//pkg/apis/core:go_default_library",
109
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
1110
"//staging/src/k8s.io/api/core/v1:go_default_library",
1211
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎test/e2e/framework/autoscaling/autoscaling_utils.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"k8s.io/apimachinery/pkg/util/intstr"
3131
"k8s.io/apimachinery/pkg/util/wait"
3232
clientset "k8s.io/client-go/kubernetes"
33-
api "k8s.io/kubernetes/pkg/apis/core"
3433
"k8s.io/kubernetes/test/e2e/framework"
3534
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
3635
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
@@ -417,7 +416,7 @@ func (rc *ResourceConsumer) CleanUp() {
417416
kind := rc.kind.GroupKind()
418417
framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, kind, rc.nsName, rc.name))
419418
framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(context.TODO(), rc.name, nil))
420-
framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, api.Kind("ReplicationController"), rc.nsName, rc.controllerName))
419+
framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, schema.GroupKind{Kind: "ReplicationController"}, rc.nsName, rc.controllerName))
421420
framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(context.TODO(), rc.controllerName, nil))
422421
}
423422

‎test/e2e/framework/metrics/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ go_library(
2222
],
2323
importpath = "k8s.io/kubernetes/test/e2e/framework/metrics",
2424
deps = [
25-
"//pkg/apis/core:go_default_library",
2625
"//pkg/kubelet/dockershim/metrics:go_default_library",
2726
"//pkg/kubelet/metrics:go_default_library",
2827
"//pkg/master/ports:go_default_library",

‎test/e2e/framework/metrics/metrics_grabber.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/fields"
2525
clientset "k8s.io/client-go/kubernetes"
26-
api "k8s.io/kubernetes/pkg/apis/core"
2726
"k8s.io/kubernetes/pkg/master/ports"
2827
"k8s.io/kubernetes/test/e2e/system"
2928

@@ -101,7 +100,7 @@ func (g *Grabber) HasRegisteredMaster() bool {
101100

102101
// GrabFromKubelet returns metrics from kubelet
103102
func (g *Grabber) GrabFromKubelet(nodeName string) (KubeletMetrics, error) {
104-
nodes, err := g.client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{FieldSelector: fields.Set{api.ObjectNameField: nodeName}.AsSelector().String()})
103+
nodes, err := g.client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{FieldSelector: fields.Set{"metadata.name": nodeName}.AsSelector().String()})
105104
if err != nil {
106105
return KubeletMetrics{}, err
107106
}

‎test/e2e/framework/rc/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ go_library(
66
importpath = "k8s.io/kubernetes/test/e2e/framework/rc",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//pkg/apis/core:go_default_library",
109
"//staging/src/k8s.io/api/core/v1:go_default_library",
1110
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
11+
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
1212
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
1313
"//staging/src/k8s.io/client-go/scale:go_default_library",
1414
"//test/e2e/framework:go_default_library",

‎test/e2e/framework/rc/rc_utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323

2424
v1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26+
"k8s.io/apimachinery/pkg/runtime/schema"
2627
clientset "k8s.io/client-go/kubernetes"
2728
scaleclient "k8s.io/client-go/scale"
28-
api "k8s.io/kubernetes/pkg/apis/core"
2929
"k8s.io/kubernetes/test/e2e/framework"
3030
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
3131
testutils "k8s.io/kubernetes/test/utils"
@@ -70,12 +70,12 @@ func ByNameContainer(name string, replicas int32, labels map[string]string, c v1
7070

7171
// DeleteRCAndWaitForGC deletes only the Replication Controller and waits for GC to delete the pods.
7272
func DeleteRCAndWaitForGC(c clientset.Interface, ns, name string) error {
73-
return framework.DeleteResourceAndWaitForGC(c, api.Kind("ReplicationController"), ns, name)
73+
return framework.DeleteResourceAndWaitForGC(c, schema.GroupKind{Kind: "ReplicationController"}, ns, name)
7474
}
7575

7676
// ScaleRC scales Replication Controller to be desired size.
7777
func ScaleRC(clientset clientset.Interface, scalesGetter scaleclient.ScalesGetter, ns, name string, size uint, wait bool) error {
78-
return framework.ScaleResource(clientset, scalesGetter, ns, name, size, wait, api.Kind("ReplicationController"), api.SchemeGroupVersion.WithResource("replicationcontrollers"))
78+
return framework.ScaleResource(clientset, scalesGetter, ns, name, size, wait, schema.GroupKind{Kind: "ReplicationController"}, v1.SchemeGroupVersion.WithResource("replicationcontrollers"))
7979
}
8080

8181
// RunRC Launches (and verifies correctness) of a Replication Controller

‎test/e2e/framework/resource/BUILD‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ go_library(
66
importpath = "k8s.io/kubernetes/test/e2e/framework/resource",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//pkg/apis/apps:go_default_library",
10-
"//pkg/apis/batch:go_default_library",
11-
"//pkg/apis/core:go_default_library",
12-
"//pkg/apis/extensions:go_default_library",
139
"//staging/src/k8s.io/api/apps/v1:go_default_library",
1410
"//staging/src/k8s.io/api/batch/v1:go_default_library",
1511
"//staging/src/k8s.io/api/core/v1:go_default_library",

‎test/e2e/framework/resource/runtimeobj.go‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,31 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/apimachinery/pkg/runtime/schema"
3131
clientset "k8s.io/client-go/kubernetes"
32-
appsinternal "k8s.io/kubernetes/pkg/apis/apps"
33-
batchinternal "k8s.io/kubernetes/pkg/apis/batch"
34-
api "k8s.io/kubernetes/pkg/apis/core"
35-
extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions"
32+
)
33+
34+
var (
35+
kindReplicationController = schema.GroupKind{Kind: "ReplicationController"}
36+
kindExtensionsReplicaSet = schema.GroupKind{Group: "extensions", Kind: "ReplicaSet"}
37+
kindAppsReplicaSet = schema.GroupKind{Group: "apps", Kind: "ReplicaSet"}
38+
kindExtensionsDeployment = schema.GroupKind{Group: "extensions", Kind: "Deployment"}
39+
kindAppsDeployment = schema.GroupKind{Group: "apps", Kind: "Deployment"}
40+
kindExtensionsDaemonSet = schema.GroupKind{Group: "extensions", Kind: "DaemonSet"}
41+
kindBatchJob = schema.GroupKind{Group: "batch", Kind: "Job"}
3642
)
3743

3844
// GetRuntimeObjectForKind returns a runtime.Object based on its GroupKind,
3945
// namespace and name.
4046
func GetRuntimeObjectForKind(c clientset.Interface, kind schema.GroupKind, ns, name string) (runtime.Object, error) {
4147
switch kind {
42-
case api.Kind("ReplicationController"):
48+
case kindReplicationController:
4349
return c.CoreV1().ReplicationControllers(ns).Get(context.TODO(), name, metav1.GetOptions{})
44-
case extensionsinternal.Kind("ReplicaSet"), appsinternal.Kind("ReplicaSet"):
50+
case kindExtensionsReplicaSet, kindAppsReplicaSet:
4551
return c.AppsV1().ReplicaSets(ns).Get(context.TODO(), name, metav1.GetOptions{})
46-
case extensionsinternal.Kind("Deployment"), appsinternal.Kind("Deployment"):
52+
case kindExtensionsDeployment, kindAppsDeployment:
4753
return c.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
48-
case extensionsinternal.Kind("DaemonSet"):
54+
case kindExtensionsDaemonSet:
4955
return c.AppsV1().DaemonSets(ns).Get(context.TODO(), name, metav1.GetOptions{})
50-
case batchinternal.Kind("Job"):
56+
case kindBatchJob:
5157
return c.BatchV1().Jobs(ns).Get(context.TODO(), name, metav1.GetOptions{})
5258
default:
5359
return nil, fmt.Errorf("Unsupported kind when getting runtime object: %v", kind)

0 commit comments

Comments
 (0)