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

move category expansion types to restmapper package

Browse Source
This commit is contained in:
David Eads
2018-05-09 11:01:49 -04:00
parent 23a9136d4e
commit 37f6cb7230
10 changed files with 206 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,7 +287,7 @@ func (f *TestFactory) Cleanup() {
os.Remove(f.tempConfigFile.Name())
}
func (f *TestFactory) CategoryExpander() categories.CategoryExpander {
func (f *TestFactory) CategoryExpander() restmapper.CategoryExpander {
return categories.LegacyCategoryExpander
}
@@ -335,6 +335,7 @@ func (f *TestFactory) Command(*cobra.Command, bool) string {
func (f *TestFactory) NewBuilder() *resource.Builder {
mapper, err := f.RESTMapper()
categoryExpander, err2 := f.CategoryExpander()
return resource.NewFakeBuilder(
func(version schema.GroupVersion) (resource.RESTClient, error) {
@@ -347,8 +348,8 @@ func (f *TestFactory) NewBuilder() *resource.Builder {
return f.Client, nil
},
mapper,
f.CategoryExpander(),
).AddError(err)
categoryExpander,
).AddError(err).AddError(err2)
}
func (f *TestFactory) KubernetesClientSet() (*kubernetes.Clientset, error) {