Merge pull request #20257 from juanvallejo/soltysh-debug

Update debug
openshift · Jul 10, 2018 · 528fc4b · 528fc4b
2 parents cebd630 + 629a383
commit 528fc4b
Show file tree

Hide file tree

Showing 39 changed files with 957 additions and 462 deletions.
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
diff --git a/docs/generated/.files_generated b/docs/generated/.files_generated
@@ -1 +0,0 @@
-oc_by_example_content.adoc

diff --git a/docs/generated/oc_by_example_content.adoc b/docs/generated/oc_by_example_content.adoc
diff --git a/pkg/oc/cli/cmd/create/create.go b/pkg/oc/cli/cmd/create/create.go
@@ -5,8 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	"k8s.io/kubernetes/pkg/kubectl/cmd/create"
+	"github.com/openshift/origin/pkg/oc/util/ocscheme"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
@@ -17,7 +16,7 @@ type CreateSubcommandOptions struct {
 	genericclioptions.IOStreams
 
 	// PrintFlags holds options necessary for obtaining a printer
-	PrintFlags *create.PrintFlags
+	PrintFlags *genericclioptions.PrintFlags
 	// Name of resource being created
 	Name string
 	// DryRun is true if the command should be simulated but not run against the server
@@ -31,7 +30,7 @@ type CreateSubcommandOptions struct {
 
 func NewCreateSubcommandOptions(ioStreams genericclioptions.IOStreams) *CreateSubcommandOptions {
 	return &CreateSubcommandOptions{
-		PrintFlags: create.NewPrintFlags("created", legacyscheme.Scheme),
+		PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(ocscheme.PrintingInternalScheme),
 		IOStreams:  ioStreams,
 	}
 }

diff --git a/pkg/oc/cli/cmd/create/route.go b/pkg/oc/cli/cmd/create/route.go
@@ -6,15 +6,14 @@ import (
 	"github.com/spf13/cobra"
 
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	"k8s.io/kubernetes/pkg/kubectl/cmd/create"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
 
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
+	"github.com/openshift/origin/pkg/oc/util/ocscheme"
 )
 
 var (
@@ -44,7 +43,7 @@ func NewCmdCreateRoute(fullName string, f kcmdutil.Factory, streams genericcliop
 // CreateRouteSubcommandOptions is an options struct to support create subcommands
 type CreateRouteSubcommandOptions struct {
 	// PrintFlags holds options necessary for obtaining a printer
-	PrintFlags *create.PrintFlags
+	PrintFlags *genericclioptions.PrintFlags
 	// Name of resource being created
 	Name        string
 	ServiceName string
@@ -66,7 +65,7 @@ type CreateRouteSubcommandOptions struct {
 
 func NewCreateRouteSubcommandOptions(ioStreams genericclioptions.IOStreams) *CreateRouteSubcommandOptions {
 	return &CreateRouteSubcommandOptions{
-		PrintFlags: create.NewPrintFlags("created", legacyscheme.Scheme),
+		PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(ocscheme.PrintingInternalScheme),
 		IOStreams:  ioStreams,
 	}
 }