Move category expander out of kubectl/resource

pkg/kubectl/resource/builder.go

@@ -31,6 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/kubernetes/pkg/kubectl/categories"
 	"k8s.io/kubernetes/pkg/kubectl/validation"
 )
 
@@ -44,7 +45,7 @@ const defaultHttpGetAttempts int = 3
 // over using the Visitor interface.
 type Builder struct {
 	mapper           *Mapper
-	categoryExpander CategoryExpander
+	categoryExpander categories.CategoryExpander
 
 	errs []error
 
@@ -115,7 +116,7 @@ type resourceTuple struct {
 }
 
 // NewBuilder creates a builder that operates on generic objects.
-func NewBuilder(mapper meta.RESTMapper, categoryExpander CategoryExpander, typer runtime.ObjectTyper, clientMapper ClientMapper, decoder runtime.Decoder) *Builder {
+func NewBuilder(mapper meta.RESTMapper, categoryExpander categories.CategoryExpander, typer runtime.ObjectTyper, clientMapper ClientMapper, decoder runtime.Decoder) *Builder {
 	return &Builder{
 		mapper:           &Mapper{typer, mapper, clientMapper, decoder},
 		categoryExpander: categoryExpander,