cli: fix bulk generator to prefer legacy group

openshift · Mar 20, 2017 · fc69c6f · fc69c6f
1 parent 0f7e04d
commit fc69c6f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/pkg/cmd/cli/cmd/create/route.go b/pkg/cmd/cli/cmd/create/route.go
@@ -7,6 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 
@@ -160,7 +161,7 @@ func CreateEdgeRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, ar
 		RESTMapper:   mapper,
 		ClientMapper: resource.ClientMapperFunc(f.ClientForMapping),
 	}
-	info, err := resourceMapper.InfoForObject(actualRoute, nil)
+	info, err := resourceMapper.InfoForObject(actualRoute, []unversioned.GroupVersionKind{{Group: ""}})
 	if err != nil {
 		return err
 	}
@@ -266,7 +267,7 @@ func CreatePassthroughRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comm
 		RESTMapper:   mapper,
 		ClientMapper: resource.ClientMapperFunc(f.ClientForMapping),
 	}
-	info, err := resourceMapper.InfoForObject(actualRoute, nil)
+	info, err := resourceMapper.InfoForObject(actualRoute, []unversioned.GroupVersionKind{{Group: ""}})
 	if err != nil {
 		return err
 	}
@@ -404,7 +405,7 @@ func CreateReencryptRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comman
 		RESTMapper:   mapper,
 		ClientMapper: resource.ClientMapperFunc(f.ClientForMapping),
 	}
-	info, err := resourceMapper.InfoForObject(actualRoute, nil)
+	info, err := resourceMapper.InfoForObject(actualRoute, []unversioned.GroupVersionKind{{Group: ""}})
 	if err != nil {
 		return err
 	}

diff --git a/pkg/config/cmd/cmd.go b/pkg/config/cmd/cmd.go
@@ -67,7 +67,7 @@ func (b *Bulk) Run(list *kapi.List, namespace string) []error {
 
 	errs := []error{}
 	for i, item := range list.Items {
-		info, err := b.Mapper.InfoForObject(item, nil)
+		info, err := b.Mapper.InfoForObject(item, []unversioned.GroupVersionKind{{Group: ""}})
 		if err != nil {
 			errs = append(errs, err)
 			if after(info, err) {

diff --git a/pkg/config/cmd/cmd_test.go b/pkg/config/cmd/cmd_test.go
@@ -30,6 +30,14 @@ func (bt *bulkTester) ResourceSingularizer(resource string) (string, error) {
 
 func (bt *bulkTester) InfoForObject(obj runtime.Object, preferredGVKs []unversioned.GroupVersionKind) (*resource.Info, error) {
 	bt.infos = append(bt.infos, obj)
+	// These checks are here to make sure the preferredGVKs are set to retain the legacy
+	// behavior for bulk operations.
+	if len(preferredGVKs) == 0 {
+		return nil, fmt.Errorf("expected preferred gvk to not be empty")
+	}
+	if preferredGVKs[0].Group != "" {
+		return nil, fmt.Errorf("expected preferred gvk to be set to prefer the legacy group")
+	}
 	return &resource.Info{Object: obj, Mapping: bt.mapping}, bt.err
 }