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

Merge pull request #15488 from caesarxuchao/experimental-extensions-client

Browse Source 
Move from "Experimental" to "Extensions"
This commit is contained in:
Dawn Chen
2015-10-13 16:54:37 -07:00
parent 61a175f0bc a5f42698b3
commit 0e0ae670ad
31 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/apiversions.go
View File

@@ -58,7 +58,7 @@ func RunApiVersions(f *cmdutil.Factory, w io.Writer) error {
}
var expAPIVersions *unversioned.APIVersions
expAPIVersions, err = client.Experimental().ServerAPIVersions()
expAPIVersions, err = client.Extensions().ServerAPIVersions()
fmt.Fprintf(w, "Available Server Api Versions: %#v\n", *apiVersions)
if err == nil {

6
pkg/kubectl/cmd/util/factory.go
View File

@@ -143,7 +143,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
case "":
return client.RESTClient, nil
case "extensions":
return client.ExperimentalClient.RESTClient, nil
return client.ExtensionsClient.RESTClient, nil
}
return nil, fmt.Errorf("unable to get RESTClient for resource '%s'", mapping.Resource)
},
@@ -407,10 +407,10 @@ func (c *clientSwaggerSchema) ValidateBytes(data []byte) error {
return fmt.Errorf("could not find api group for %s: %v", kind, err)
}
if group == "extensions" {
if c.c.ExperimentalClient == nil {
if c.c.ExtensionsClient == nil {
return errors.New("unable to validate: no experimental client")
}
return getSchemaAndValidate(c.c.ExperimentalClient.RESTClient, data, "apis/", version, c.cacheDir)
return getSchemaAndValidate(c.c.ExtensionsClient.RESTClient, data, "apis/", version, c.cacheDir)
}
return getSchemaAndValidate(c.c.RESTClient, data, "api", version, c.cacheDir)
}