Merge pull request #17356 from juanvallejo/jvallejo/move-clientcmd-pkg-oc

Automatic merge from submit-queue.

move pkg/cmd/util/clientcmd -> pkg/oc/cli/util/clientcmd

This patch *partially* solves a few of the items (currently checked) from #17309 
Now that `clientcmd` (which includes printer factory methods) is moved into `pkg/oc`,
the following files outside of `pkg/oc` need to have their dependency on `clientcmd` broken (this will be done in a separate PR):

- [x] pkg/cmd/server/origin/controller/config.go (#17357)
- [x] pkg/cmd/server/admin/create_error_template.go   (#17357)
- [x] pkg/cmd/server/admin/create_bootstrap_project_template.go (#17357)
- [x] pkg/cmd/server/admin/overwrite_bootstrappolicy.go (*this file has been removed by* #17336)
- [x] pkg/cmd/server/admin/create_login_template.go (#17357)
- [x] pkg/cmd/server/admin/create_provider_selection_template.go (#17357)
- [x] **pkg/cmd/infra/router/template.go** (Wanted by: `pkg/cmd/openshift/openshift.go` (no other dependents)) (#17357)
- [x] **pkg/cmd/infra/router/f5.go** (Wanted by: `pkg/cmd/openshift/openshift.go` (no other dependents)) (#17357)
- [x] pkg/cmd/openshift/openshift.go (#17486 and #17482)
- [x] pkg/cmd/dockerregistry/dockerregistry.go (Wanted by: `cmd/dockerregistry/main.go` (depends on `clientcmd.Config`)) (#17357)
- [x] *pkg/diagnostics/networkpod/util/util.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/client/config_contexts.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/client/run_diagnostics_pod.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/pod/auth.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/network/run_pod.go* (Can be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] pkg/ipfailover/keepalived/plugin.go (moved to `pkg/oc/experimental`) (#17357)
- [x] pkg/federation/kubefed/kubefed.go (#17357)
- [x] pkg/dockerregistry/server/client/client.go (#17357)
- [x] pkg/dockerregistry/server/auth_test.go (#17357)

**bold** = depends on `clientcmd.Config` (not sure what to do about this) AND only dependent is `pkg/cmd/openshift/openshift.go`

cc @deads2k @openshift/cli-review @liggitt

Author: openshift-merge-robot

pkg/cmd/infra/router/f5.go

@@ -13,8 +13,8 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	cmdversion "github.com/openshift/origin/pkg/cmd/version"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 	projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
 	routeinternalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"

pkg/cmd/infra/router/template.go

@@ -29,8 +29,8 @@ import (
 
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
 	"github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	cmdversion "github.com/openshift/origin/pkg/cmd/version"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 	projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
 	routeinternalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"
 	"github.com/openshift/origin/pkg/router"

pkg/cmd/openshift/openshift.go

@@ -20,12 +20,12 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/start"
 	"github.com/openshift/origin/pkg/cmd/templates"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	"github.com/openshift/origin/pkg/oc/admin"
 	diagnostics "github.com/openshift/origin/pkg/oc/admin/diagnostics"
 	sync "github.com/openshift/origin/pkg/oc/admin/groups/sync/cli"
 	"github.com/openshift/origin/pkg/oc/admin/validate"
 	"github.com/openshift/origin/pkg/oc/cli/cmd"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 	"github.com/openshift/origin/pkg/oc/experimental/buildchain"
 	configcmd "github.com/openshift/origin/pkg/oc/experimental/config"
 	"github.com/openshift/origin/pkg/oc/experimental/dockergc"

pkg/cmd/server/admin/create_bootstrap_project_template.go

@@ -8,7 +8,7 @@ import (
 
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 	"github.com/openshift/origin/pkg/project/registry/projectrequest/delegated"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 )

pkg/cmd/server/admin/create_error_template.go

@@ -10,7 +10,7 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/auth/server/errorpage"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 
 const CreateErrorTemplateCommand = "create-error-template"

pkg/cmd/server/admin/create_login_template.go

@@ -10,7 +10,7 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/auth/server/login"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 
 const CreateLoginTemplateCommand = "create-login-template"

pkg/cmd/server/admin/create_provider_selection_template.go

@@ -10,7 +10,7 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/auth/server/selectprovider"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 
 const CreateProviderSelectionTemplateCommand = "create-provider-selection-template"

pkg/cmd/server/origin/controller/config.go

@@ -14,8 +14,8 @@ import (
 
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 
 func getOpenShiftClientEnvVars(options configapi.MasterConfig) ([]kapi.EnvVar, error) {

pkg/federation/kubefed/kubefed.go

@@ -14,7 +14,7 @@ import (
 	kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 
-	osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 	"github.com/openshift/origin/pkg/version"
 )
 

pkg/ipfailover/keepalived/plugin.go

@@ -11,9 +11,9 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
-	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	"github.com/openshift/origin/pkg/generate/app"
 	"github.com/openshift/origin/pkg/ipfailover"
+	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 
 // KeepalivedPlugin is an IP Failover configurator plugin for keepalived sidecar.