REVIEW: adapt: pkg/cmd/util/clientcmd

Make sure we convert to v1 for List in PrintResourceInfos.

Author: Andy Goldstein

pkg/cmd/util/clientcmd/factory.go

@@ -67,7 +67,7 @@ func NewFactory(optionalClientConfig kclientcmd.ClientConfig) *Factory {
 // PrintResourceInfos receives a list of resource infos and prints versioned objects if a generic output format was specified
 // otherwise, it iterates through info objects, printing each resource with a unique printer for its mapping
 func (f *Factory) PrintResourceInfos(cmd *cobra.Command, infos []*resource.Info, out io.Writer) error {
-	printer, generic, err := kcmdutil.PrinterForCommand(cmd)
+	printer, generic, err := f.PrinterForCommand(cmd)
 	if err != nil {
 		return nil
 	}
@@ -81,24 +81,29 @@ func (f *Factory) PrintResourceInfos(cmd *cobra.Command, infos []*resource.Info,
 			if err := printer.PrintObj(info.Object, out); err != nil {
 				return nil
 			}
+			return nil
 		}
-		return nil
 	}
 
-	clientConfig, err := f.ClientConfig()
-	if err != nil {
-		return err
-	}
-	outputVersion, err := kcmdutil.OutputVersion(cmd, clientConfig.GroupVersion)
-	if err != nil {
-		return err
+	printAsList := len(infos) != 1
+
+	// If we're not printing multiple objects, we'll pass an empty GroupVersion to AsVersionedObject
+	// because we shouldn't need to do any conversion.
+	var gv schema.GroupVersion
+
+	if printAsList {
+		// If we're printing a list of objects, we do need to convert at least the outer List container
+		// from internal to versioned, so we need to set gv appropriately.
+		// TODO is there a better way to do this?
+		gv = schema.GroupVersion{Group: "", Version: "v1"}
 	}
-	object, err := resource.AsVersionedObject(infos, len(infos) != 1, outputVersion, api.Codecs.LegacyCodec(outputVersion))
+
+	object, err := resource.AsVersionedObject(infos, printAsList, gv, api.Codecs.LegacyCodec())
 	if err != nil {
 		return err
 	}
-	return printer.PrintObj(object, out)
 
+	return printer.PrintObj(object, out)
 }
 
 // FlagBinder represents an interface that allows to bind extra flags into commands.
@@ -382,12 +387,12 @@ func FindAllCanonicalResources(d discovery.DiscoveryInterface, m meta.RESTMapper
 	if err != nil {
 		return nil, err
 	}
-	for apiVersion, v := range all {
-		gv, err := schema.ParseGroupVersion(apiVersion)
+	for _, serverResource := range all {
+		gv, err := schema.ParseGroupVersion(serverResource.GroupVersion)
 		if err != nil {
 			continue
 		}
-		for _, r := range v.APIResources {
+		for _, r := range serverResource.APIResources {
 			// ignore subresources
 			if strings.Contains(r.Name, "/") {
 				continue

pkg/cmd/util/clientcmd/factory_client_access.go

@@ -29,7 +29,6 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl"
-	"k8s.io/kubernetes/pkg/kubectl/cmd/set"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 	kprinters "k8s.io/kubernetes/pkg/printers"
@@ -161,6 +160,10 @@ func (f *ring0Factory) ClientConfig() (*restclient.Config, error) {
 	return f.kubeClientAccessFactory.ClientConfig()
 }
 
+func (f *ring0Factory) BareClientConfig() (*restclient.Config, error) {
+	return f.clientConfig.ClientConfig()
+}
+
 func (f *ring0Factory) ClientConfigForVersion(requiredVersion *schema.GroupVersion) (*restclient.Config, error) {
 	return f.kubeClientAccessFactory.ClientConfigForVersion(nil)
 }
@@ -234,8 +237,8 @@ func (f *ring0Factory) FlagSet() *pflag.FlagSet {
 	return f.kubeClientAccessFactory.FlagSet()
 }
 
-func (f *ring0Factory) Command() string {
-	return f.kubeClientAccessFactory.Command()
+func (f *ring0Factory) Command(cmd *cobra.Command, showSecrets bool) string {
+	return f.kubeClientAccessFactory.Command(cmd, showSecrets)
 }
 
 func (f *ring0Factory) BindFlags(flags *pflag.FlagSet) {
@@ -267,25 +270,19 @@ func (f *ring0Factory) Printer(mapping *meta.RESTMapping, options kprinters.Prin
 			options.Kind = alias
 		}
 	}
-	return describe.NewHumanReadablePrinter(options), nil
+	return describe.NewHumanReadablePrinter(f.JSONEncoder(), f.Decoder(true), options), nil
 }
 
-func (f *ring0Factory) Pauser(info *resource.Info) (bool, error) {
+func (f *ring0Factory) Pauser(info *resource.Info) ([]byte, error) {
+	// TODO(rebase): compare with origin master, the logic changed completely
 	switch t := info.Object.(type) {
 	case *deployapi.DeploymentConfig:
-		patches := set.CalculatePatches([]*resource.Info{info}, f.JSONEncoder(), func(*resource.Info) (bool, error) {
-			if t.Spec.Paused {
-				return false, nil
-			}
-			t.Spec.Paused = true
-			return true, nil
-		})
-		if len(patches) == 0 {
-			return true, nil
+		if t.Spec.Paused {
+			return nil, errors.New("is already paused")
 		}
-		_, err := resource.NewHelper(info.Client, info.Mapping).Patch(info.Namespace, info.Name, kapi.StrategicMergePatchType, patches[0].Patch)
+		t.Spec.Paused = true
 		// TODO: Pause the deployer containers.
-		return false, err
+		return runtime.Encode(f.JSONEncoder(), info.Object)
 	default:
 		return f.kubeClientAccessFactory.Pauser(info)
 	}
@@ -331,22 +328,16 @@ func (f *ring0Factory) ResolveImage(image string) (string, error) {
 	return imageutil.ResolveImagePullSpec(oc, oc, options.Source, image, namespace)
 }
 
-func (f *ring0Factory) Resumer(info *resource.Info) (bool, error) {
+func (f *ring0Factory) Resumer(info *resource.Info) ([]byte, error) {
+	// TODO(rebase): compare with origin master, the logic changed completely
 	switch t := info.Object.(type) {
 	case *deployapi.DeploymentConfig:
-		patches := set.CalculatePatches([]*resource.Info{info}, f.JSONEncoder(), func(*resource.Info) (bool, error) {
-			if !t.Spec.Paused {
-				return false, nil
-			}
-			t.Spec.Paused = false
-			return true, nil
-		})
-		if len(patches) == 0 {
-			return true, nil
+		if !t.Spec.Paused {
+			return nil, errors.New("is not paused")
 		}
-		_, err := resource.NewHelper(info.Client, info.Mapping).Patch(info.Namespace, info.Name, kapi.StrategicMergePatchType, patches[0].Patch)
+		t.Spec.Paused = false
 		// TODO: Resume the deployer containers.
-		return false, err
+		return runtime.Encode(f.JSONEncoder(), info.Object)
 	default:
 		return f.kubeClientAccessFactory.Resumer(info)
 	}

pkg/cmd/util/clientcmd/factory_object_mapping.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/emicklei/go-restful/swagger"
-	"github.com/spf13/cobra"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -21,7 +20,6 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/api/validation"
-	"k8s.io/kubernetes/pkg/client/typed/dynamic"
 	"k8s.io/kubernetes/pkg/controller"
 	"k8s.io/kubernetes/pkg/kubectl"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -295,47 +293,6 @@ func (f *ring1Factory) AttachablePodForObject(object runtime.Object) (*kapi.Pod,
 	}
 }
 
-// PrinterForMapping returns a printer suitable for displaying the provided resource type.
-// Requires that printer flags have been added to cmd (see AddPrinterFlags).
-func (f *ring1Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMapping, withNamespace bool) (kubectl.ResourcePrinter, error) {
-	/*
-		// TODO FIX ME. COPIED FROM KUBE AS PART OF THE COPY/PASTE FOR
-		// PrinterForMapping
-		if latest.OriginKind(mapping.GroupVersionKind) {
-			printer, ok, err := kcmdutil.PrinterForCommand(cmd)
-			if err != nil {
-				return nil, err
-			}
-			if ok && mapping != nil {
-				printer = kubectl.NewVersionedPrinter(printer, mapping.ObjectConvertor, mapping.GroupVersionKind.GroupVersion())
-			} else {
-				// Some callers do not have "label-columns" so we can't use the GetFlagStringSlice() helper
-				columnLabel, err := cmd.Flags().GetStringSlice("label-columns")
-				if err != nil {
-					columnLabel = []string{}
-				}
-				printer, err = f.Printer(mapping, kubectl.PrintOptions{
-					NoHeaders:          kcmdutil.GetFlagBool(cmd, "no-headers"),
-					WithNamespace:      withNamespace,
-					Wide:               kcmdutil.GetWideFlag(cmd),
-					ShowAll:            kcmdutil.GetFlagBool(cmd, "show-all"),
-					ShowLabels:         kcmdutil.GetFlagBool(cmd, "show-labels"),
-					AbsoluteTimestamps: isWatch(cmd),
-					ColumnLabels:       columnLabel,
-				})
-				if err != nil {
-					return nil, err
-				}
-				printer = maybeWrapSortingPrinter(cmd, printer)
-			}
-
-			return printer, nil
-		}
-	*/
-
-	return f.kubeObjectMappingFactory.PrinterForMapping(cmd, mapping, withNamespace)
-}
-
 func (f *ring1Factory) Validator(validate bool, cacheDir string) (validation.Schema, error) {
 	return f.kubeObjectMappingFactory.Validator(validate, cacheDir)
 }