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

Merge pull request #32141 from deads2k/client-01-fix-swagger

Browse Source 
Automatic merge from submit-queue

make swaggerschema agnostic about which version to use

`Factory.SwaggerSchema` was reliant on having a non-generated client bits filled in so that it could get the adapted client it wanted.  There's no need since discovery ignores configured GroupVersions.  This eliminates the unneeded dependency.
This commit is contained in:
Kubernetes Submit Queue 2016-09-09 22:27:52 -07:00 committed by GitHub
commit 8b5317bf87
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -741,12 +741,18 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
return validation.NullSchema{}, nil return validation.NullSchema{}, nil
}, },
SwaggerSchema: func(gvk unversioned.GroupVersionKind) (*swagger.ApiDeclaration, error) { SwaggerSchema: func(gvk unversioned.GroupVersionKind) (*swagger.ApiDeclaration, error) {
version := gvk.GroupVersion() // discovery doesn't care about which groupversion you get a client for,
client, err := clients.ClientForVersion(&version) // so get whichever one you happen to have available and use that.
cfg, err := clients.ClientConfigForVersion(nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return client.Discovery().SwaggerSchema(version) dc, err := discovery.NewDiscoveryClientForConfig(cfg)
if err != nil {
return nil, err
}
return dc.SwaggerSchema(gvk.GroupVersion())
}, },
DefaultNamespace: func() (string, bool, error) { DefaultNamespace: func() (string, bool, error) {
return clientConfig.Namespace() return clientConfig.Namespace()