github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

update factory interface to overlap with lower RESTClientGetter

Browse Source
This commit is contained in:
David Eads
2018-05-16 10:54:42 -04:00
parent a481f4bbe8
commit 0db40da909
27 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubectl/cmd/util/factory_client_access.go
View File

@@ -81,24 +81,24 @@ func NewClientAccessFactory(clientGetter RESTClientGetter) ClientAccessFactory {
return f
}
func (f *ring0Factory) ClientConfig() (*restclient.Config, error) {
func (f *ring0Factory) ToRESTConfig() (*restclient.Config, error) {
return f.clientGetter.ToRESTConfig()
}
func (f *ring0Factory) RESTMapper() (meta.RESTMapper, error) {
func (f *ring0Factory) ToRESTMapper() (meta.RESTMapper, error) {
return f.clientGetter.ToRESTMapper()
}
func (f *ring0Factory) BareClientConfig() (*restclient.Config, error) {
return f.clientGetter.ToRESTConfig()
}
func (f *ring0Factory) DiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
func (f *ring0Factory) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
return f.clientGetter.ToDiscoveryClient()
}
func (f *ring0Factory) ToRawKubeConfigLoader() clientcmd.ClientConfig {
return f.clientGetter.ToRawKubeConfigLoader()
}
func (f *ring0Factory) KubernetesClientSet() (*kubernetes.Clientset, error) {
clientConfig, err := f.ClientConfig()
clientConfig, err := f.ToRESTConfig()
if err != nil {
return nil, err
}
@@ -106,7 +106,7 @@ func (f *ring0Factory) KubernetesClientSet() (*kubernetes.Clientset, error) {
}
func (f *ring0Factory) ClientSet() (internalclientset.Interface, error) {
clientConfig, err := f.ClientConfig()
clientConfig, err := f.ToRESTConfig()
if err != nil {
return nil, err
}
@@ -114,7 +114,7 @@ func (f *ring0Factory) ClientSet() (internalclientset.Interface, error) {
}
func (f *ring0Factory) DynamicClient() (dynamic.Interface, error) {
clientConfig, err := f.ClientConfig()
clientConfig, err := f.ToRESTConfig()
if err != nil {
return nil, err
}
@@ -127,7 +127,7 @@ func (f *ring0Factory) NewBuilder() *resource.Builder {
}
func (f *ring0Factory) RESTClient() (*restclient.RESTClient, error) {
clientConfig, err := f.ClientConfig()
clientConfig, err := f.ToRESTConfig()
if err != nil {
return nil, err
}