github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

make builder tolerant of restmapper failures when it doesn't need the answer

Browse Source
This commit is contained in:
David Eads
2018-06-21 14:03:26 -04:00
parent 90f681be10
commit bc10b25465
6 changed files with 120 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/testing/fake.go
View File

@@ -322,8 +322,6 @@ func (f *TestFactory) OpenAPISchema() (openapi.Resources, error) {
}
func (f *TestFactory) NewBuilder() *resource.Builder {
mapper, err := f.ToRESTMapper()
return resource.NewFakeBuilder(
func(version schema.GroupVersion) (resource.RESTClient, error) {
if f.UnstructuredClientForMappingFunc != nil {
@@ -334,9 +332,11 @@ func (f *TestFactory) NewBuilder() *resource.Builder {
}
return f.Client, nil
},
mapper,
resource.FakeCategoryExpander,
).AddError(err)
f.ToRESTMapper,
func() (restmapper.CategoryExpander, error) {
return resource.FakeCategoryExpander, nil
},
)
}
func (f *TestFactory) KubernetesClientSet() (*kubernetes.Clientset, error) {