github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

move testing/core to client-go

Browse Source
This commit is contained in:
deads2k
2017-01-25 15:07:10 -05:00
parent 76ce7bcbd8
commit 9488e2ba30
337 changed files with 1506 additions and 2777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/util/clientcache.go
View File

@@ -27,6 +27,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
oldclient "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/version"
)
func NewClientCache(loader clientcmd.ClientConfig, discoveryClientFactory DiscoveryClientFactory) *ClientCache {
@@ -76,7 +77,7 @@ func (c *ClientCache) getDefaultConfig() (restclient.Config, discovery.Discovery
return restclient.Config{}, nil, err
}
if c.matchVersion {
if err := discovery.MatchesServerVersion(discoveryClient); err != nil {
if err := discovery.MatchesServerVersion(version.Get(), discoveryClient); err != nil {
return restclient.Config{}, nil, err
}
}