Skip to content

Update debug #20257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 10, 2018
Merged

Update debug #20257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7d79c8
UPSTREAM: 65711: make template printers a recommended printer
soltysh Jul 5, 2018
5f255ae
UPSTREAM: 65786: update --template printer defaulting
soltysh Jul 5, 2018
41dfa11
UPSTREAM: <drop>: carry old printers until we update
soltysh Jul 5, 2018
5ac7e0e
Update debug
soltysh Jul 5, 2018
22f7cb7
Generated changes
soltysh Jul 5, 2018
629a383
update printflags on create cmds
juanvallejo Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 195 additions & 4 deletions contrib/completions/bash/oc
View file
Open in desktop

Large diffs are not rendered by default.

199 changes: 195 additions & 4 deletions contrib/completions/zsh/oc
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/generated/.files_generated
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
oc_by_example_content.adoc
3 changes: 0 additions & 3 deletions docs/generated/oc_by_example_content.adoc
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions pkg/oc/cli/cmd/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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,
}
}
Expand Down
7 changes: 3 additions & 4 deletions pkg/oc/cli/cmd/create/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand All @@ -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,
}
}
Expand Down
Loading