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

Merge pull request #35866 from madhusudancs/federation-kubefed-init-fakeclient

Browse Source 
Automatic merge from submit-queue

Make the fake command factory return the clientset with appropriate rest clients for all the API groups.

Please review only the last commit here. This is based on PR #35865 which will be reviewed independently.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @nikhiljindal
This commit is contained in:
Kubernetes Submit Queue
2016-11-04 05:46:46 -07:00
committed by GitHub
parent f64253a8d7 0092cda7ed
commit 9531442cd6
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubectl/cmd/testing/fake.go
View File

@@ -413,14 +413,23 @@ func (f *fakeAPIFactory) JSONEncoder() runtime.Encoder {
} }
func (f *fakeAPIFactory) ClientSet() (*internalclientset.Clientset, error) { func (f *fakeAPIFactory) ClientSet() (*internalclientset.Clientset, error) {
// Swap out the HTTP client out of the client with the fake's version. // Swap the HTTP client out of the REST client with the fake
// version.
fakeClient := f.tf.Client.(*fake.RESTClient) fakeClient := f.tf.Client.(*fake.RESTClient)
restClient, err := restclient.RESTClientFor(f.tf.ClientConfig) clientset := internalclientset.NewForConfigOrDie(f.tf.ClientConfig)
if err != nil { clientset.CoreClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
panic(err) clientset.AuthenticationClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
} clientset.AuthorizationClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
restClient.Client = fakeClient.Client clientset.AutoscalingClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
return internalclientset.New(restClient), f.tf.Err clientset.BatchClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.CertificatesClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.ExtensionsClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.RbacClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.StorageClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.AppsClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.PolicyClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.DiscoveryClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
return clientset, f.tf.Err
} }
func (f *fakeAPIFactory) RESTClient() (*restclient.RESTClient, error) { func (f *fakeAPIFactory) RESTClient() (*restclient.RESTClient, error) {