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

Merge pull request #75616 from andrewsykim/e2e-remove-internal-clientset

Browse Source 
remove usages of internal clientset in e2e framework
This commit is contained in:
Kubernetes Prow Robot
2019-04-01 15:48:36 -07:00
committed by GitHub
parent 4db3fccd6f 1470df7a05
commit 5d77a5217a
29 changed files with 158 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/framework.go
View File

@@ -47,7 +47,6 @@ import (
scaleclient "k8s.io/client-go/scale"
aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/test/e2e/framework/metrics"
testutils "k8s.io/kubernetes/test/utils"
@@ -75,9 +74,8 @@ type Framework struct {
ClientSet clientset.Interface
KubemarkExternalClusterClientSet clientset.Interface
InternalClientset *internalclientset.Clientset
AggregatorClient *aggregatorclient.Clientset
DynamicClient dynamic.Interface
AggregatorClient *aggregatorclient.Clientset
DynamicClient dynamic.Interface
ScalesGetter scaleclient.ScalesGetter
@@ -180,8 +178,6 @@ func (f *Framework) BeforeEach() {
}
f.ClientSet, err = clientset.NewForConfig(config)
ExpectNoError(err)
f.InternalClientset, err = internalclientset.NewForConfig(config)
ExpectNoError(err)
f.AggregatorClient, err = aggregatorclient.NewForConfig(config)
ExpectNoError(err)
f.DynamicClient, err = dynamic.NewForConfig(config)