simplify resource builder usage

pkg/kubectl/cmd/create/BUILD

@@ -41,6 +41,7 @@ go_library(
         "//vendor/k8s.io/api/rbac/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",

pkg/kubectl/cmd/create/create.go

@@ -29,6 +29,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	kruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
@@ -404,29 +405,29 @@ func RunCreateSubcommand(f cmdutil.Factory, options *CreateSubcommandOptions) er
 		if err != nil {
 			return err
 		}
-		client, err := f.ClientForMapping(mapping)
-		if err != nil {
-			return err
-		}
-		resourceMapper := &resource.Mapper{
-			RESTMapper:   mapper,
-			ClientMapper: resource.ClientMapperFunc(f.ClientForMapping),
-		}
-		info, err := resourceMapper.InfoForObject(obj, legacyscheme.Scheme, nil)
-		if err != nil {
-			return err
-		}
-		if err := kubectl.CreateOrUpdateAnnotation(options.CreateAnnotation, info.Object, cmdutil.InternalVersionJSONEncoder()); err != nil {
+
+		if err := kubectl.CreateOrUpdateAnnotation(options.CreateAnnotation, obj, cmdutil.InternalVersionJSONEncoder()); err != nil {
 			return err
 		}
 
-		obj, err = resource.NewHelper(client, mapping).Create(namespace, false, info.Object)
+		asUnstructured := &unstructured.Unstructured{}
+		if err := legacyscheme.Scheme.Convert(obj, asUnstructured, nil); err != nil {
+			return err
+		}
+		dynamicClient, err := f.DynamicClient()
+		if err != nil {
+			return err
+		}
+		if mapping.Scope.Name() == meta.RESTScopeNameRoot {
+			namespace = ""
+		}
+		actualObject, err := dynamicClient.Resource(mapping.GroupVersionKind.GroupVersion().WithResource(mapping.Resource)).Namespace(namespace).Create(asUnstructured)
 		if err != nil {
 			return err
 		}
 
 		// ensure we pass a versioned object to the printer
-		obj = cmdutil.AsDefaultVersionedOrOriginal(info.Object, info.Mapping)
+		obj = actualObject
 	} else {
 		if meta, err := meta.Accessor(obj); err == nil && nsOverriden {
 			meta.SetNamespace(namespace)

pkg/kubectl/cmd/create/create_quota_test.go

@@ -17,41 +17,16 @@ limitations under the License.
 package create
 
 import (
-	"net/http"
 	"testing"
 
 	"k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/client-go/rest/fake"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
-	"k8s.io/kubernetes/pkg/kubectl/scheme"
 )
 
 func TestCreateQuota(t *testing.T) {
 	resourceQuotaObject := &v1.ResourceQuota{}
 	resourceQuotaObject.Name = "my-quota"
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-
-	codec := legacyscheme.Codecs.LegacyCodec(scheme.Versions...)
-	ns := legacyscheme.Codecs
-
-	tf.Client = &fake.RESTClient{
-		GroupVersion:         schema.GroupVersion{Version: "v1"},
-		NegotiatedSerializer: ns,
-		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
-			switch p, m := req.URL.Path, req.Method; {
-			case p == "/namespaces/test/resourcequotas" && m == "POST":
-				return &http.Response{StatusCode: 201, Header: defaultHeader(), Body: objBody(codec, resourceQuotaObject)}, nil
-			default:
-				t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
-				return nil, nil
-			}
-		}),
-	}
-	tf.Namespace = "test"
 
 	tests := map[string]struct {
 		flags          []string
@@ -75,14 +50,21 @@ func TestCreateQuota(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
-		cmd := NewCmdCreateQuota(tf, ioStreams)
-		cmd.Flags().Parse(test.flags)
-		cmd.Flags().Set("output", "name")
-		cmd.Run(cmd, []string{resourceQuotaObject.Name})
+		t.Run(name, func(t *testing.T) {
+			tf := cmdtesting.NewTestFactory()
+			defer tf.Cleanup()
 
-		if buf.String() != test.expectedOutput {
-			t.Errorf("%s: expected output: %s, but got: %s", name, test.expectedOutput, buf.String())
-		}
+			tf.Namespace = "test"
+
+			ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
+			cmd := NewCmdCreateQuota(tf, ioStreams)
+			cmd.Flags().Parse(test.flags)
+			cmd.Flags().Set("output", "name")
+			cmd.Run(cmd, []string{resourceQuotaObject.Name})
+
+			if buf.String() != test.expectedOutput {
+				t.Errorf("%s: expected output: %s, but got: %s", name, test.expectedOutput, buf.String())
+			}
+		})
 	}
 }