github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

address lavalamp's comments

Browse Source
This commit is contained in:
Chao Xu 2015-10-07 16:19:22 -07:00
parent 6dc99b52dd
commit efe7d30a64
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,41 +205,30 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) {
return nil, err return nil, err
} }
// Get the groupVersions exposed at /api // Get the groupVersions exposed at /api
req, err := http.NewRequest("GET", baseURL.String()+"/api", nil) baseURL.Path = "/api"
if err != nil { resp, err := client.Get(baseURL.String())
return nil, err
}
resp, err := client.Do(req)
if err != nil {
return nil, err
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var v api.APIVersions var v api.APIVersions
err = json.Unmarshal(body, &v) defer resp.Body.Close()
err = json.NewDecoder(resp.Body).Decode(&v)
if err != nil { if err != nil {
return nil, fmt.Errorf("got '%s': %v", string(body), err) return nil, fmt.Errorf("unexpected error: %v", err)
} }
groupVersions = append(groupVersions, v.Versions...) groupVersions = append(groupVersions, v.Versions...)
// Get the groupVersions exposed at /apis // Get the groupVersions exposed at /apis
req, err = http.NewRequest("GET", baseURL.String()+"/apis", nil) baseURL.Path = "/apis"
if err != nil { resp2, err := client.Get(baseURL.String())
return nil, err
}
resp, err = client.Do(req)
if err != nil {
return nil, err
}
body, err = ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var apiGroupList api.APIGroupList var apiGroupList api.APIGroupList
err = json.Unmarshal(body, &apiGroupList) defer resp2.Body.Close()
err = json.NewDecoder(resp2.Body).Decode(&apiGroupList)
if err != nil { if err != nil {
return nil, fmt.Errorf("got '%s': %v", string(body), err) return nil, fmt.Errorf("unexpected error: %v", err)
} }
groupVersions = append(groupVersions, extractGroupVersions(&apiGroupList)...) groupVersions = append(groupVersions, extractGroupVersions(&apiGroupList)...)