Merge pull request #22365 from deads2k/pre-base-15

oc: remove unnecessary conversion

pkg/oc/cli/cancelbuild/cancelbuild.go

@@ -7,6 +7,8 @@ import (
 	"sync"
 	"time"
 
+	"k8s.io/kubernetes/pkg/kubectl/scheme"
+
 	"github.com/spf13/cobra"
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -120,16 +122,27 @@ func (o *CancelBuildOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, ar
 		fmt.Fprintf(o.ErrOut, "error: %s\n", err.Error())
 	}
 
-	// FIXME: this double printers should not be necessary
-	o.PrinterCancel = &printers.NamePrinter{Operation: "cancelled"}
-	o.PrinterRestart = &printers.NamePrinter{Operation: "restarted"}
-	o.PrinterCancelInProgress = &printers.NamePrinter{Operation: "marked for cancellation, waiting to be cancelled"}
+	var err error
+	o.PrinterCancel, err = printers.NewTypeSetter(scheme.Scheme).
+		WrapToPrinter(&printers.NamePrinter{Operation: "cancelled"}, nil)
+	if err != nil {
+		return err
+	}
+	o.PrinterRestart, err = printers.NewTypeSetter(scheme.Scheme).
+		WrapToPrinter(&printers.NamePrinter{Operation: "restarted"}, nil)
+	if err != nil {
+		return err
+	}
+	o.PrinterCancelInProgress, err = printers.NewTypeSetter(scheme.Scheme).
+		WrapToPrinter(&printers.NamePrinter{Operation: "marked for cancellation, waiting to be cancelled"}, nil)
+	if err != nil {
+		return err
+	}
 
 	if o.timeout.Seconds() == 0 {
 		o.timeout = 30 * time.Second
 	}
 
-	var err error
 	o.Namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
 	if err != nil {
 		return err
@@ -256,7 +269,7 @@ func (o *CancelBuildOptions) RunCancelBuild() error {
 			}
 
 			// ignore exit if error here; the phase verfication below is more important
-			o.PrinterCancelInProgress.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(build, nil), o.Out)
+			o.PrinterCancelInProgress.PrintObj(build, o.Out)
 
 			// Make sure the build phase is really cancelled.
 			timeout := o.timeout
@@ -278,7 +291,7 @@ func (o *CancelBuildOptions) RunCancelBuild() error {
 				return
 			}
 
-			if err := o.PrinterCancel.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(build, nil), o.Out); err != nil {
+			if err := o.PrinterCancel.PrintObj(build, o.Out); err != nil {
 				o.ReportError(fmt.Errorf("build %s/%s failed to print: %v", build.Namespace, build.Name, err))
 				return
 			}
@@ -294,7 +307,7 @@ func (o *CancelBuildOptions) RunCancelBuild() error {
 				o.ReportError(fmt.Errorf("build %s/%s failed to restart: %v", b.Namespace, b.Name, err))
 				continue
 			}
-			if err := o.PrinterRestart.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(b, nil), o.Out); err != nil {
+			if err := o.PrinterRestart.PrintObj(b, o.Out); err != nil {
 				o.ReportError(fmt.Errorf("build %s/%s failed to print: %v", build.Namespace, build.Name, err))
 				continue
 			}

pkg/oc/cli/rollback/rollback.go

@@ -192,7 +192,7 @@ func (o *RollbackOptions) Validate() error {
 // Run performs a rollback.
 func (o *RollbackOptions) Run() error {
 	// Get the resource referenced in the command args.
-	obj, mapping, err := o.findResource(o.TargetName)
+	obj, _, err := o.findResource(o.TargetName)
 	if err != nil {
 		return err
 	}
@@ -258,7 +258,7 @@ func (o *RollbackOptions) Run() error {
 		if err != nil {
 			return err
 		}
-		return printer.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(newConfig, mapping), o.Out)
+		return printer.PrintObj(newConfig, o.Out)
 	}
 
 	// Perform a real rollback.
@@ -285,7 +285,7 @@ func (o *RollbackOptions) Run() error {
 		return err
 	}
 
-	return printer.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(rolledback, mapping), o.Out)
+	return printer.PrintObj(rolledback, o.Out)
 }
 
 // findResource tries to find a deployment or deploymentconfig named

pkg/oc/cli/rollout/cancel.go

@@ -12,7 +12,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -36,7 +35,6 @@ type CancelOptions struct {
 	Namespace         string
 	NamespaceExplicit bool
 	Mapper            meta.RESTMapper
-	Encoder           runtime.Encoder
 	Resources         []string
 	KubeClient        kubernetes.Interface
 
@@ -100,7 +98,6 @@ func (o *CancelOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []
 	if err != nil {
 		return err
 	}
-	o.Encoder = kcmdutil.InternalVersionJSONEncoder()
 
 	o.Namespace, o.NamespaceExplicit, err = f.ToRawKubeConfigLoader().Namespace()
 	if err != nil {

pkg/oc/cli/rollout/latest.go

@@ -65,7 +65,7 @@ type RolloutLatestOptions struct {
 func NewRolloutLatestOptions(streams genericclioptions.IOStreams) *RolloutLatestOptions {
 	return &RolloutLatestOptions{
 		IOStreams:  streams,
-		PrintFlags: genericclioptions.NewPrintFlags("rolled out"),
+		PrintFlags: genericclioptions.NewPrintFlags("rolled out").WithTypeSetter(scheme.Scheme),
 	}
 }
 
@@ -112,7 +112,11 @@ func (o *RolloutLatestOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command,
 
 	if o.PrintFlags.OutputFormat != nil && *o.PrintFlags.OutputFormat == "revision" {
 		fmt.Fprintln(o.ErrOut, "--output=revision is deprecated. Use `--output=jsonpath={.status.latestVersion}` or `--output=go-template={{.status.latestVersion}}` instead")
-		o.Printer = &revisionPrinter{}
+		o.Printer, err = printers.NewTypeSetter(scheme.Scheme).
+			WrapToPrinter(&revisionPrinter{}, nil)
+		if err != nil {
+			return err
+		}
 	} else {
 		o.Printer, err = o.PrintFlags.ToPrinter()
 		if err != nil {
@@ -207,7 +211,7 @@ func (o *RolloutLatestOptions) RunRolloutLatest() error {
 		info.Refresh(dc, true)
 	}
 
-	return o.Printer.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(info.Object, info.Mapping), o.Out)
+	return o.Printer.PrintObj(info.Object, o.Out)
 }
 
 type revisionPrinter struct{}

pkg/oc/cli/rollout/retry.go

@@ -10,7 +10,6 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -33,7 +32,6 @@ type RetryOptions struct {
 	Resources         []string
 	Builder           func() *resource.Builder
 	Mapper            meta.RESTMapper
-	Encoder           runtime.Encoder
 	Clientset         kexternalclientset.Interface
 	Namespace         string
 	ExplicitNamespace bool
@@ -100,7 +98,6 @@ func (o *RetryOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []s
 	if err != nil {
 		return err
 	}
-	o.Encoder = kcmdutil.InternalVersionJSONEncoder()
 
 	o.Namespace, o.ExplicitNamespace, err = f.ToRawKubeConfigLoader().Namespace()
 	if err != nil {

pkg/oc/cli/set/env.go

@@ -332,7 +332,7 @@ func (o *EnvOptions) RunEnv() error {
 	oldObjects := []runtime.Object{}
 	oldData := make([][]byte, len(infos))
 	for i := range infos {
-		oldObjects = append(oldObjects, kcmdutil.AsDefaultVersionedOrOriginal(infos[i].Object.DeepCopyObject(), nil))
+		oldObjects = append(oldObjects, infos[i].Object.DeepCopyObject())
 		old, err := json.Marshal(oldObjects[i])
 		if err != nil {
 			return err
@@ -470,12 +470,12 @@ updates:
 			continue
 		}
 
-		newData, err := json.Marshal(kcmdutil.AsDefaultVersionedOrOriginal(infos[i].Object, nil))
+		newData, err := json.Marshal(infos[i].Object)
 		if err != nil {
 			allErrs = append(allErrs, err)
 			continue
 		}
-		patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData[i], newData, kcmdutil.AsDefaultVersionedOrOriginal(infos[i].Object, nil))
+		patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData[i], newData, infos[i].Object)
 		if err != nil {
 			allErrs = append(allErrs, err)
 			continue

pkg/oc/cli/set/volume.go

@@ -104,7 +104,6 @@ type VolumeOptions struct {
 	Mapper                 meta.RESTMapper
 	Client                 kubernetes.Interface
 	UpdatePodSpecForObject polymorphichelpers.UpdatePodSpecForObjectFunc
-	Encoder                runtime.Encoder
 	Builder                func() *resource.Builder
 
 	// Resource selection
@@ -356,7 +355,6 @@ func (o *VolumeOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []
 
 	o.Args = args
 	o.Builder = f.NewBuilder
-	o.Encoder = kcmdutil.InternalVersionJSONEncoder()
 	o.UpdatePodSpecForObject = polymorphichelpers.UpdatePodSpecForObjectFn
 
 	o.AddOpts.TypeChanged = cmd.Flag("type").Changed
@@ -547,7 +545,7 @@ func (o *VolumeOptions) RunVolume() error {
 
 func (o *VolumeOptions) getVolumeUpdatePatches(infos []*resource.Info, singleItemImplied bool) ([]*Patch, error) {
 	skipped := 0
-	patches := CalculatePatches(infos, o.Encoder, func(info *resource.Info) (bool, error) {
+	patches := CalculatePatches(infos, scheme.DefaultJSONEncoder(), func(info *resource.Info) (bool, error) {
 		transformed := false
 		ok, err := o.UpdatePodSpecForObject(info.Object, func(spec *corev1.PodSpec) error {
 			var e error

pkg/oc/cli/set/volume_test.go

@@ -11,7 +11,6 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions/resource"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
-	"k8s.io/kubernetes/pkg/kubectl/scheme"
 
 	"github.com/openshift/origin/pkg/oc/originpolymorphichelpers"
 )
@@ -122,7 +121,6 @@ func getFakeInfo(podInfo *corev1.Pod) ([]*resource.Info, *VolumeOptions) {
 	infos := []*resource.Info{info}
 	vOptions := &VolumeOptions{}
 	vOptions.Name = "fake-mount"
-	vOptions.Encoder = scheme.DefaultJSONEncoder()
 	vOptions.Containers = "*"
 	// we need to manually set this the way it is set in pkg/oc/cli/shim_kubectl.go
 	vOptions.UpdatePodSpecForObject = originpolymorphichelpers.NewUpdatePodSpecForObjectFn(polymorphichelpers.UpdatePodSpecForObjectFn)