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

remove ServerAPIVersions from client

Browse Source 
hard-code the groupVersion in SetKubernetesDefaults
This commit is contained in:
Chao Xu
2015-12-10 17:51:32 -08:00
parent 5fb943950d
commit f2edba3bec
7 changed files with 26 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/client/unversioned/helper.go
View File

@@ -248,14 +248,15 @@ func NegotiateVersion(client *Client, c *Config, requestedGV *unversioned.GroupV
for _, gv := range clientRegisteredGVs {
clientVersions.Insert(gv.String())
}
apiVersions, err := client.ServerAPIVersions()
groups, err := client.ServerGroups()
if err != nil {
// This is almost always a connection error, and higher level code should treat this as a generic error,
// not a negotiation specific error.
return nil, err
}
versions := ExtractGroupVersions(groups)
serverVersions := sets.String{}
for _, v := range apiVersions.Versions {
for _, v := range versions {
serverVersions.Insert(v)
}
@@ -362,10 +363,14 @@ func SetKubernetesDefaults(config *Config) error {
if len(config.UserAgent) == 0 {
config.UserAgent = DefaultKubernetesUserAgent()
}
if config.GroupVersion == nil {
config.GroupVersion = defaultVersionFor(config)
g, err := latest.Group(api.GroupName)
if err != nil {
return err
}
versionInterfaces, err := latest.GroupOrDie(api.GroupName).InterfacesFor(*config.GroupVersion)
// TODO: Unconditionally set the config.Version, until we fix the config.
copyGroupVersion := g.GroupVersion
config.GroupVersion = &copyGroupVersion
versionInterfaces, err := g.InterfacesFor(*config.GroupVersion)
if err != nil {
return fmt.Errorf("API version '%v' is not recognized (valid values: %v)", *config.GroupVersion, latest.GroupOrDie(api.GroupName).GroupVersions)
}