Skip to content

Commit 5c1ec9f

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request openshift#20041 from deads2k/rebase-05-prep-factory
 switch to upstream factory for cli
2 parents f6c9969 + b27cda5 commit 5c1ec9f

File tree

130 files changed

+545
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+545
-645
lines changed

‎pkg/oc/admin/create_bootstrap_project_template.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import (
66

77
"github.com/spf13/cobra"
88

9-
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
9+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1010

11-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1211
"github.com/openshift/origin/pkg/project/registry/projectrequest/delegated"
1312
templateapi "github.com/openshift/origin/pkg/template/apis/template"
1413
)
@@ -19,31 +18,31 @@ type CreateBootstrapProjectTemplateOptions struct {
1918
Name string
2019
}
2120

22-
func NewCommandCreateBootstrapProjectTemplate(f *clientcmd.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
21+
func NewCommandCreateBootstrapProjectTemplate(f kcmdutil.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
2322
options := &CreateBootstrapProjectTemplateOptions{}
2423

2524
cmd := &cobra.Command{
2625
Use: commandName,
2726
Short: "Create a bootstrap project template",
2827
Run: func(cmd *cobra.Command, args []string) {
2928
if err := options.Validate(args); err != nil {
30-
cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, err.Error()))
29+
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
3130
}
3231

3332
template, err := options.CreateBootstrapProjectTemplate()
3433
if err != nil {
35-
cmdutil.CheckErr(err)
34+
kcmdutil.CheckErr(err)
3635
}
3736

38-
err = cmdutil.PrintObject(cmd, template, out)
37+
err = kcmdutil.PrintObject(cmd, template, out)
3938
if err != nil {
40-
cmdutil.CheckErr(err)
39+
kcmdutil.CheckErr(err)
4140
}
4241
},
4342
}
4443

4544
cmd.Flags().StringVar(&options.Name, "name", delegated.DefaultTemplateName, "The name of the template to output.")
46-
cmdutil.AddPrinterFlags(cmd)
45+
kcmdutil.AddPrinterFlags(cmd)
4746

4847
// Default to JSON
4948
if flag := cmd.Flags().Lookup("output"); flag != nil {

‎pkg/oc/admin/create_error_template.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import (
77
"github.com/spf13/cobra"
88

99
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
10-
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
10+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1111

1212
"github.com/openshift/origin/pkg/oauthserver/server/errorpage"
13-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1413
)
1514

1615
const CreateErrorTemplateCommand = "create-error-template"
@@ -32,7 +31,7 @@ var errorLongDescription = templates.LongDesc(`
3231

3332
type CreateErrorTemplateOptions struct{}
3433

35-
func NewCommandCreateErrorTemplate(f *clientcmd.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
34+
func NewCommandCreateErrorTemplate(f kcmdutil.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
3635
options := &CreateErrorTemplateOptions{}
3736

3837
cmd := &cobra.Command{
@@ -41,12 +40,12 @@ func NewCommandCreateErrorTemplate(f *clientcmd.Factory, commandName string, ful
4140
Long: errorLongDescription,
4241
Run: func(cmd *cobra.Command, args []string) {
4342
if err := options.Validate(args); err != nil {
44-
cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, err.Error()))
43+
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
4544
}
4645

4746
_, err := io.WriteString(out, errorpage.ErrorPageTemplateExample)
4847
if err != nil {
49-
cmdutil.CheckErr(err)
48+
kcmdutil.CheckErr(err)
5049
}
5150
},
5251
}

‎pkg/oc/admin/create_login_template.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import (
77
"github.com/spf13/cobra"
88

99
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
10-
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
10+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1111

1212
"github.com/openshift/origin/pkg/oauthserver/server/login"
13-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1413
)
1514

1615
const CreateLoginTemplateCommand = "create-login-template"
@@ -33,7 +32,7 @@ var longDescription = templates.LongDesc(`
3332

3433
type CreateLoginTemplateOptions struct{}
3534

36-
func NewCommandCreateLoginTemplate(f *clientcmd.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
35+
func NewCommandCreateLoginTemplate(f kcmdutil.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
3736
options := &CreateLoginTemplateOptions{}
3837

3938
cmd := &cobra.Command{
@@ -42,12 +41,12 @@ func NewCommandCreateLoginTemplate(f *clientcmd.Factory, commandName string, ful
4241
Long: longDescription,
4342
Run: func(cmd *cobra.Command, args []string) {
4443
if err := options.Validate(args); err != nil {
45-
cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, err.Error()))
44+
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
4645
}
4746

4847
_, err := io.WriteString(out, login.LoginTemplateExample)
4948
if err != nil {
50-
cmdutil.CheckErr(err)
49+
kcmdutil.CheckErr(err)
5150
}
5251
},
5352
}

‎pkg/oc/admin/create_provider_selection_template.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import (
77
"github.com/spf13/cobra"
88

99
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
10-
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
10+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1111

1212
"github.com/openshift/origin/pkg/oauthserver/server/selectprovider"
13-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1413
)
1514

1615
const CreateProviderSelectionTemplateCommand = "create-provider-selection-template"
@@ -33,7 +32,7 @@ var providerSelectionLongDescription = templates.LongDesc(`
3332

3433
type CreateProviderSelectionTemplateOptions struct{}
3534

36-
func NewCommandCreateProviderSelectionTemplate(f *clientcmd.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
35+
func NewCommandCreateProviderSelectionTemplate(f kcmdutil.Factory, commandName string, fullName string, out io.Writer) *cobra.Command {
3736
options := &CreateProviderSelectionTemplateOptions{}
3837

3938
cmd := &cobra.Command{
@@ -42,12 +41,12 @@ func NewCommandCreateProviderSelectionTemplate(f *clientcmd.Factory, commandName
4241
Long: providerSelectionLongDescription,
4342
Run: func(cmd *cobra.Command, args []string) {
4443
if err := options.Validate(args); err != nil {
45-
cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, err.Error()))
44+
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
4645
}
4746

4847
_, err := io.WriteString(out, selectprovider.SelectProviderTemplateExample)
4948
if err != nil {
50-
cmdutil.CheckErr(err)
49+
kcmdutil.CheckErr(err)
5150
}
5251
},
5352
}

‎pkg/oc/admin/diagnostics/diagnostics.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"k8s.io/apimachinery/pkg/util/sets"
1515
kclientcmd "k8s.io/client-go/tools/clientcmd"
1616
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
17+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1718

1819
"github.com/openshift/origin/pkg/cmd/flagtypes"
1920
poddiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client/pod/in_pod"
@@ -46,7 +47,7 @@ type DiagnosticsOptions struct {
4647
// creates flags as a byproduct, most of which we don't want.
4748
// The command creates these and binds only the flags we want.
4849
ClientFlags *flag.FlagSet
49-
Factory *osclientcmd.Factory
50+
Factory kcmdutil.Factory
5051
// specify context name to be used for cluster-admin access
5152
ClientClusterContext string
5253
// LogOptions determine globally what the user wants to see and how.

‎pkg/oc/admin/diagnostics/diagnostics/client/pod/run_diagnostics_pod.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
kapi "k8s.io/kubernetes/pkg/apis/core"
1515
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
16+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1617

1718
"github.com/openshift/origin/pkg/cmd/util/variable"
1819
poddiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client/pod/in_pod"
1920
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
20-
osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
2121
)
2222

2323
const (
@@ -31,7 +31,7 @@ type DiagnosticPod struct {
3131
KubeClient kclientset.Interface
3232
Namespace string
3333
Level int
34-
Factory *osclientcmd.Factory
34+
Factory kcmdutil.Factory
3535
PreventModification bool
3636
ImageTemplate variable.ImageTemplate
3737
}

‎pkg/oc/admin/diagnostics/diagnostics/cluster/app_create/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import (
1616
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
1717
authorizationtypedclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion"
1818
rbacclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion"
19+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1920

2021
appsclient "github.com/openshift/origin/pkg/apps/generated/internalclientset"
2122
"github.com/openshift/origin/pkg/cmd/util/variable"
2223
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
2324
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
2425
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/util"
25-
osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
2626
projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
2727
routeclient "github.com/openshift/origin/pkg/route/generated/internalclientset"
2828
)
@@ -36,7 +36,7 @@ type AppCreate struct {
3636
RbacClient *rbacclient.RbacClient
3737
AppsClient *appsclient.Clientset
3838
SARClient authorizationtypedclient.SelfSubjectAccessReviewsGetter
39-
Factory *osclientcmd.Factory
39+
Factory kcmdutil.Factory
4040

4141
// from parameters specific to this diagnostic:
4242
// specs for the project where the diagnostic will put all test items

‎pkg/oc/admin/diagnostics/diagnostics/cluster/network/in_pod/util/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
kapi "k8s.io/kubernetes/pkg/apis/core"
1111
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
1212
kubecmd "k8s.io/kubernetes/pkg/kubectl/cmd"
13+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1314

1415
"github.com/openshift/origin/pkg/cmd/util/variable"
1516
"github.com/openshift/origin/pkg/network"
1617
networkapi "github.com/openshift/origin/pkg/network/apis/network"
1718
networktypedclient "github.com/openshift/origin/pkg/network/generated/internalclientset/typed/network/internalversion"
18-
osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1919
"github.com/openshift/origin/pkg/util/netutils"
2020
"github.com/openshift/origin/pkg/version"
2121
)
@@ -202,7 +202,7 @@ func ExpectedConnectionStatus(ns1, ns2 string, vnidMap map[string]uint32) bool {
202202
}
203203

204204
// Execute() will run a command in a pod and streams the out/err
205-
func Execute(factory *osclientcmd.Factory, command []string, pod *kapi.Pod, in io.Reader, out, errOut io.Writer) error {
205+
func Execute(factory kcmdutil.Factory, command []string, pod *kapi.Pod, in io.Reader, out, errOut io.Writer) error {
206206
config, err := factory.ClientConfig()
207207
if err != nil {
208208
return err

‎pkg/oc/admin/diagnostics/diagnostics/cluster/network/run_pod.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ import (
1919
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
2020
kapi "k8s.io/kubernetes/pkg/apis/core"
2121
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
22+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2223

2324
networktypedclient "github.com/openshift/origin/pkg/network/generated/internalclientset/typed/network/internalversion"
2425
networkpoddiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/network/in_pod"
2526
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/network/in_pod/util"
2627
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
2728
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
28-
osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
2929
)
3030

3131
const (
@@ -44,7 +44,7 @@ type NetworkDiagnostic struct {
4444
ClusterNetworkClient networktypedclient.ClusterNetworksGetter
4545
ClientFlags *flag.FlagSet
4646
Level int
47-
Factory *osclientcmd.Factory
47+
Factory kcmdutil.Factory
4848
RawConfig *clientcmdapi.Config
4949
PreventModification bool
5050
LogDir string

‎pkg/oc/admin/groups/changemembership.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/spf13/cobra"
1414

15-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1615
userclientinternal "github.com/openshift/origin/pkg/user/generated/internalclientset"
1716
usertypedclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
1817
)
@@ -49,7 +48,7 @@ type GroupModificationOptions struct {
4948
Users []string
5049
}
5150

52-
func NewCmdAddUsers(name, fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {
51+
func NewCmdAddUsers(name, fullName string, f kcmdutil.Factory, out io.Writer) *cobra.Command {
5352
options := &GroupModificationOptions{}
5453

5554
cmd := &cobra.Command{
@@ -72,7 +71,7 @@ func NewCmdAddUsers(name, fullName string, f *clientcmd.Factory, out io.Writer)
7271
return cmd
7372
}
7473

75-
func NewCmdRemoveUsers(name, fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {
74+
func NewCmdRemoveUsers(name, fullName string, f kcmdutil.Factory, out io.Writer) *cobra.Command {
7675
options := &GroupModificationOptions{}
7776

7877
cmd := &cobra.Command{
@@ -95,7 +94,7 @@ func NewCmdRemoveUsers(name, fullName string, f *clientcmd.Factory, out io.Write
9594
return cmd
9695
}
9796

98-
func (o *GroupModificationOptions) Complete(f *clientcmd.Factory, args []string) error {
97+
func (o *GroupModificationOptions) Complete(f kcmdutil.Factory, args []string) error {
9998
if len(args) < 2 {
10099
return errors.New("you must specify at least two arguments: GROUP USER [USER ...]")
101100
}

‎pkg/oc/admin/groups/groups.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
99

1010
"github.com/openshift/origin/pkg/oc/admin/groups/sync/cli"
11-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1211
)
1312

1413
const GroupsRecommendedName = "groups"
@@ -18,7 +17,7 @@ var groupLong = templates.LongDesc(`
1817
1918
Groups are sets of users that can be used when describing policy.`)
2019

21-
func NewCmdGroups(name, fullName string, f *clientcmd.Factory, out, errOut io.Writer) *cobra.Command {
20+
func NewCmdGroups(name, fullName string, f cmdutil.Factory, out, errOut io.Writer) *cobra.Command {
2221
// Parent command to which all subcommands are added.
2322
cmds := &cobra.Command{
2423
Use: name,

‎pkg/oc/admin/groups/new.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1414
kprinters "k8s.io/kubernetes/pkg/printers"
1515

16-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
1716
userapi "github.com/openshift/origin/pkg/user/apis/user"
1817
userclientinternal "github.com/openshift/origin/pkg/user/generated/internalclientset"
1918
usertypedclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
@@ -48,7 +47,7 @@ type NewGroupOptions struct {
4847
Printer kprinters.ResourcePrinterFunc
4948
}
5049

51-
func NewCmdNewGroup(name, fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {
50+
func NewCmdNewGroup(name, fullName string, f kcmdutil.Factory, out io.Writer) *cobra.Command {
5251
options := &NewGroupOptions{Out: out}
5352

5453
cmd := &cobra.Command{
@@ -70,7 +69,7 @@ func NewCmdNewGroup(name, fullName string, f *clientcmd.Factory, out io.Writer)
7069
return cmd
7170
}
7271

73-
func (o *NewGroupOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []string) error {
72+
func (o *NewGroupOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []string) error {
7473
if len(args) < 1 {
7574
return errors.New("You must specify at least one argument: GROUP [USER ...]")
7675
}

‎pkg/oc/admin/groups/sync/cli/prune.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212
"k8s.io/apimachinery/pkg/util/validation/field"
1313
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1414
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
15+
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1516

1617
"github.com/openshift/origin/pkg/cmd/server/apis/config"
1718
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation/ldap"
1819
"github.com/openshift/origin/pkg/oauthserver/ldaputil"
1920
"github.com/openshift/origin/pkg/oauthserver/ldaputil/ldapclient"
2021
"github.com/openshift/origin/pkg/oc/admin/groups/sync"
21-
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
2222
userclientinternal "github.com/openshift/origin/pkg/user/generated/internalclientset"
2323
usertypedclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
2424
)
@@ -81,7 +81,7 @@ func NewPruneOptions() *PruneOptions {
8181
}
8282
}
8383

84-
func NewCmdPrune(name, fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {
84+
func NewCmdPrune(name, fullName string, f kcmdutil.Factory, out io.Writer) *cobra.Command {
8585
options := NewPruneOptions()
8686
options.Out = out
8787

@@ -125,7 +125,7 @@ func NewCmdPrune(name, fullName string, f *clientcmd.Factory, out io.Writer) *co
125125
return cmd
126126
}
127127

128-
func (o *PruneOptions) Complete(whitelistFile, blacklistFile, configFile string, args []string, f *clientcmd.Factory) error {
128+
func (o *PruneOptions) Complete(whitelistFile, blacklistFile, configFile string, args []string, f kcmdutil.Factory) error {
129129
var err error
130130

131131
o.Config, err = decodeSyncConfigFromFile(configFile)
@@ -170,7 +170,7 @@ func (o *PruneOptions) Validate() error {
170170

171171
// Run creates the GroupSyncer specified and runs it to sync groups
172172
// the arguments are only here because its the only way to get the printer we need
173-
func (o *PruneOptions) Run(cmd *cobra.Command, f *clientcmd.Factory) error {
173+
func (o *PruneOptions) Run(cmd *cobra.Command, f kcmdutil.Factory) error {
174174
bindPassword, err := config.ResolveStringValue(o.Config.BindPassword)
175175
if err != nil {
176176
return err

0 commit comments

Comments
 (0)