github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Take GVK in SwaggerSchema()

Browse Source 
This is needed for the legacy OpenShift API group (oapi) which is also
group: "", version: "v1", but needs to return a different swagger
schema.  Will in the future be replaced by group defaulting.
This commit is contained in:
Clayton Coleman 2016-02-06 21:19:42 -05:00
parent 6103b8713e
commit 664d25ba5a
2 changed files with 5 additions and 4 deletions
Show Stats 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