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

Merge pull request #20779 from smarterclayton/origin_explain

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-07 12:45:09 -08:00
parent bc36f57a68 664d25ba5a
commit fd38f4f47e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ func RunExplain(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []st
} }
} }
schema, err := f.SwaggerSchema(apiVersion) schema, err := f.SwaggerSchema(apiVersion.WithKind(gvk.Kind))
if err != nil { if err != nil {
return err return err
} }

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

@@ -106,8 +106,8 @@ type Factory struct {
ResumeObject func(object runtime.Object) (bool, error) ResumeObject func(object runtime.Object) (bool, error)
// Returns a schema that can validate objects stored on disk. // Returns a schema that can validate objects stored on disk.
Validator func(validate bool, cacheDir string) (validation.Schema, error) Validator func(validate bool, cacheDir string) (validation.Schema, error)
// SwaggerSchema returns the schema declaration for the provided group version. // SwaggerSchema returns the schema declaration for the provided group version kind.
SwaggerSchema func(unversioned.GroupVersion) (*swagger.ApiDeclaration, error) SwaggerSchema func(unversioned.GroupVersionKind) (*swagger.ApiDeclaration, error)
// Returns the default namespace to use in cases where no // Returns the default namespace to use in cases where no
// other namespace is specified and whether the namespace was // other namespace is specified and whether the namespace was
// overriden. // overriden.
@@ -408,7 +408,8 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
} }
return validation.NullSchema{}, nil return validation.NullSchema{}, nil
}, },
SwaggerSchema: func(version unversioned.GroupVersion) (*swagger.ApiDeclaration, error) { SwaggerSchema: func(gvk unversioned.GroupVersionKind) (*swagger.ApiDeclaration, error) {
version := gvk.GroupVersion()
client, err := clients.ClientForVersion(&version) client, err := clients.ClientForVersion(&version)
if err != nil { if err != nil {
return nil, err return nil, err