github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 15:20:17 +00:00
Code Issues Projects Releases Wiki Activity

use http.client in ServerAPIVersions

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

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

@ -191,12 +191,29 @@ func extractGroupVersions(l *api.APIGroupList) []string {
// on the Version, Codec, and Prefix of the config, because it uses AbsPath and
// takes the raw response.
func ServerAPIVersions(c *Config) (groupVersions []string, err error) {
client, err := RESTClientFor(c)
transport, err := TransportFor(c)
if err != nil {
return nil, err
}
client := http.Client{Transport: transport}
configCopy := *c
configCopy.Version = ""
configCopy.Prefix = ""
baseURL, err := defaultServerUrlFor(c)
if err != nil {
return nil, err
}
// Get the groupVersions exposed at /api
body, err := client.Get().AbsPath("api").Do().Raw()
req, err := http.NewRequest("GET", baseURL.String()+"/api", nil)
if err != nil {
return nil, err
}
resp, err := client.Do(req)
if err != nil {
return nil, err
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
@ -207,7 +224,15 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) {
}
groupVersions = append(groupVersions, v.Versions...)
// Get the groupVersions exposed at /apis
body, err = client.Get().AbsPath("apis").Do().Raw()
req, err = http.NewRequest("GET", baseURL.String()+"/apis", nil)
if err != nil {
return nil, err
}
resp, err = client.Do(req)
if err != nil {
return nil, err
}
body, err = ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
@ -519,9 +544,6 @@ func DefaultServerURL(host, prefix, version string, defaultTLS bool) (*url.URL,
if host == "" {
return nil, fmt.Errorf("host must be a URL or a host:port pair")
}
if version == "" {
return nil, fmt.Errorf("version must be set")
}
base := host
hostURL, err := url.Parse(base)
if err != nil {