github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove internal client dependency in pkg/*

Browse Source
This commit is contained in:
yue9944882
2019-02-02 18:19:40 +08:00
parent 9be22b7329
commit 65ba58a9a5
14 changed files with 49 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/tests/BUILD
View File

@@ -20,8 +20,6 @@ go_test(
"//pkg/api/testapi:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/install:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/client/clientset_generated/internalclientset/fake:go_default_library",
"//pkg/kubelet/server/portforward:go_default_library",
"//pkg/kubelet/server/remotecommand:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -33,6 +31,8 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/util/httpstream:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/remotecommand:go_default_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/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/tools/portforward:go_default_library",

16
pkg/client/tests/fake_client_test.go
View File

@@ -19,9 +19,9 @@ package tests
import (
"testing"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "k8s.io/kubernetes/pkg/apis/core"
clientsetfake "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
clientsetfake "k8s.io/client-go/kubernetes/fake"
_ "k8s.io/kubernetes/pkg/apis/core/install"
)
@@ -155,8 +155,8 @@ func TestFakeClientsetInheritsNamespace(t *testing.T) {
}
}
func testSA(ns, name string) *api.ServiceAccount {
return &api.ServiceAccount{
func testSA(ns, name string) *corev1.ServiceAccount {
return &corev1.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
Name: name,
@@ -164,8 +164,8 @@ func testSA(ns, name string) *api.ServiceAccount {
}
}
func testPod(ns, name string) *api.Pod {
return &api.Pod{
func testPod(ns, name string) *corev1.Pod {
return &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
Name: name,
@@ -173,8 +173,8 @@ func testPod(ns, name string) *api.Pod {
}
}
func testNamespace(ns string) *api.Namespace {
return &api.Namespace{
func testNamespace(ns string) *corev1.Namespace {
return &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: ns,
},

2
pkg/client/tests/listwatch_test.go
View File

@@ -29,12 +29,12 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
. "k8s.io/client-go/tools/cache"
watchtools "k8s.io/client-go/tools/watch"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/kubernetes/pkg/api/testapi"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
)
func parseSelectorOrDie(s string) fields.Selector {