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

handle non-generated client removal

Browse Source
This commit is contained in:
deads2k
2016-10-24 10:58:05 -04:00
parent 969e945a9e
commit 81ae13084d
15 changed files with 185 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/framework/util.go
View File

@@ -1793,14 +1793,6 @@ func LoadFederatedConfig(overrides *clientcmd.ConfigOverrides) (*restclient.Conf
return cfg, nil
}
func loadClientFromConfig(config *restclient.Config) (*client.Client, error) {
c, err := client.New(config)
if err != nil {
return nil, fmt.Errorf("error creating client: %v", err.Error())
}
return c, nil
}
func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) {
config, err := LoadFederatedConfig(&clientcmd.ConfigOverrides{})
if err != nil {
@@ -1814,14 +1806,6 @@ func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) {
return c, nil
}
func LoadClient() (*client.Client, error) {
config, err := LoadConfig()
if err != nil {
return nil, fmt.Errorf("error creating client: %v", err.Error())
}
return loadClientFromConfig(config)
}
func LoadInternalClientset() (*clientset.Clientset, error) {
config, err := LoadConfig()
if err != nil {