Merge pull request openshift#19335 from deads2k/cli-25-configpatch

use the upstream construction for kubeconfig evaluation

Author: openshift-merge-robot

contrib/completions/bash/oc

@@ -461,7 +461,6 @@
       "github.com/openshift/origin/pkg/build/registry/buildconfig",
       "github.com/openshift/origin/pkg/build/util",
       "github.com/openshift/origin/pkg/bulk",
-      "github.com/openshift/origin/pkg/client/cmd",
       "github.com/openshift/origin/pkg/client/config",
       "github.com/openshift/origin/pkg/cmd/flagtypes",
       "github.com/openshift/origin/pkg/cmd/server/admin",

contrib/completions/zsh/oc

@@ -1,4 +1,4 @@
-package cmd
+package router
 
 import (
 	"fmt"
@@ -17,7 +17,6 @@ import (
 
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 
-	"github.com/openshift/origin/pkg/client/config"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
 	"github.com/openshift/origin/pkg/cmd/util"
 )
@@ -64,13 +63,6 @@ func (cfg *Config) Bind(flags *pflag.FlagSet) {
 	}
 }
 
-// BindToFile is used when this config will not be bound to flags, but should load the config file
-// from disk if available.
-func (cfg *Config) BindToFile() *Config {
-	cfg.clientConfig = DefaultClientConfig(pflag.NewFlagSet("empty", pflag.ContinueOnError))
-	return cfg
-}
-
 // OpenShiftConfig returns the OpenShift configuration
 func (cfg *Config) OpenShiftConfig() *restclient.Config {
 	err := cfg.bindEnv()
@@ -205,9 +197,9 @@ func (cfg *Config) bindEnv() error {
 }
 
 func DefaultClientConfig(flags *pflag.FlagSet) kclientcmd.ClientConfig {
-	loadingRules := config.NewOpenShiftClientConfigLoadingRules()
-	flags.StringVar(&loadingRules.ExplicitPath, config.OpenShiftConfigFlagName, "", "Path to the config file to use for CLI requests.")
-	cobra.MarkFlagFilename(flags, config.OpenShiftConfigFlagName)
+	loadingRules := kclientcmd.NewDefaultClientConfigLoadingRules()
+	flags.StringVar(&loadingRules.ExplicitPath, kclientcmd.OpenShiftKubeConfigFlagName, "", "Path to the config file to use for CLI requests.")
+	cobra.MarkFlagFilename(flags, kclientcmd.OpenShiftKubeConfigFlagName)
 
 	// set our explicit defaults
 	defaultOverrides := &kclientcmd.ConfigOverrides{ClusterDefaults: kclientcmdapi.Cluster{Server: os.Getenv("KUBERNETES_MASTER")}}

hack/import-restrictions.json

@@ -14,7 +14,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	clientcmd "github.com/openshift/origin/pkg/client/cmd"
 	"github.com/openshift/origin/pkg/cmd/util"
 	cmdversion "github.com/openshift/origin/pkg/cmd/version"
 	projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
@@ -42,7 +41,7 @@ var (
 // F5RouterOptions represent the complete structure needed to start an F5 router
 // sync process.
 type F5RouterOptions struct {
-	Config *clientcmd.Config
+	Config *Config
 
 	F5Router
 	RouterSelection
@@ -138,12 +137,12 @@ func (o *F5Router) Validate() error {
 // NewCommandF5Router provides CLI handler for the F5 router sync plugin.
 func NewCommandF5Router(name string) *cobra.Command {
 	options := &F5RouterOptions{
-		Config: clientcmd.NewConfig(),
+		Config: NewConfig(),
 	}
 	options.Config.FromFile = true
 
 	cmd := &cobra.Command{
-		Use:   fmt.Sprintf("%s%s", name, clientcmd.ConfigSyntax),
+		Use:   fmt.Sprintf("%s%s", name, ConfigSyntax),
 		Short: "Start an F5 route synchronizer",
 		Long:  f5Long,
 		Run: func(c *cobra.Command, args []string) {

pkg/client/config/loader.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	clientcmd "github.com/openshift/origin/pkg/client/cmd"
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
 	"github.com/openshift/origin/pkg/cmd/util"
 	cmdversion "github.com/openshift/origin/pkg/cmd/version"
@@ -63,7 +62,7 @@ var routerLong = templates.LongDesc(`
 	that you must have a cluster-wide administrative role to view all namespaces.`)
 
 type TemplateRouterOptions struct {
-	Config *clientcmd.Config
+	Config *Config
 
 	TemplateRouter
 	RouterStats
@@ -138,12 +137,12 @@ func (o *RouterStats) Bind(flag *pflag.FlagSet) {
 // NewCommndTemplateRouter provides CLI handler for the template router backend
 func NewCommandTemplateRouter(name string) *cobra.Command {
 	options := &TemplateRouterOptions{
-		Config: clientcmd.NewConfig(),
+		Config: NewConfig(),
 	}
 	options.Config.FromFile = true
 
 	cmd := &cobra.Command{
-		Use:   fmt.Sprintf("%s%s", name, clientcmd.ConfigSyntax),
+		Use:   fmt.Sprintf("%s%s", name, ConfigSyntax),
 		Short: "Start a router",
 		Long:  routerLong,
 		Run: func(c *cobra.Command, args []string) {

pkg/client/cmd/clientcmd.go renamed to pkg/cmd/infra/router/clientcmd.go

@@ -7,9 +7,9 @@ import (
 	"os"
 
 	"k8s.io/client-go/tools/clientcmd"
+	kclientcmd "k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
-	"github.com/openshift/origin/pkg/client/config"
 	"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/util"
 )
 
@@ -32,12 +32,12 @@ func (o DiagnosticsOptions) detectClientConfig() (expected bool, detected bool)
 		return false, false
 	}
 	o.Logger().Notice("CED2011", "Determining if client configuration exists for client/cluster diagnostics")
-	confFlagName := config.OpenShiftConfigFlagName
+	confFlagName := kclientcmd.OpenShiftKubeConfigFlagName
 	confFlagValue := o.ClientFlags.Lookup(confFlagName).Value.String()
 	successfulLoad := false
 
 	var foundPath string
-	rules := config.NewOpenShiftClientConfigLoadingRules()
+	rules := kclientcmd.NewDefaultClientConfigLoadingRules()
 	paths := append([]string{confFlagValue}, rules.Precedence...)
 	for index, path := range paths {
 		errmsg := ""
@@ -47,8 +47,8 @@ func (o DiagnosticsOptions) detectClientConfig() (expected bool, detected bool)
 		case len(paths) - 1: // config in ~/.kube
 		// no error message indicated if it is not there... user didn't say it would be
 		default: // can be multiple paths from the env var in theory; all cases should go here
-			if len(os.Getenv(config.OpenShiftConfigPathEnvVar)) != 0 {
-				errmsg = fmt.Sprintf("Env var %s specified that client config could be at %s\n", config.OpenShiftConfigPathEnvVar, path)
+			if len(os.Getenv(kclientcmd.RecommendedConfigPathEnvVar)) != 0 {
+				errmsg = fmt.Sprintf("Env var %s specified that client config could be at %s\n", kclientcmd.RecommendedConfigPathEnvVar, path)
 			}
 		}
 
@@ -88,7 +88,7 @@ location for use by the client and diagnostics.
 		for _, path := range util.AdminKubeConfigPaths {
 			msg := fmt.Sprintf("Looking for a possible client config at %s\n", path)
 			if o.canOpenConfigFile(path, msg) {
-				o.Logger().Warn("DCli1003", fmt.Sprintf(adminWarningF, config.OpenShiftConfigPathEnvVar, path, config.RecommendedHomeFile))
+				o.Logger().Warn("DCli1003", fmt.Sprintf(adminWarningF, kclientcmd.RecommendedConfigPathEnvVar, path, kclientcmd.RecommendedHomeFile))
 				break
 			}
 		}

pkg/cmd/infra/router/f5.go

@@ -12,9 +12,9 @@ import (
 
 	kutilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
+	kclientcmd "k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 
-	"github.com/openshift/origin/pkg/client/config"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
 	poddiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client/pod/in_pod"
 	networkpoddiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/network/in_pod"
@@ -223,7 +223,7 @@ func (o *DiagnosticsOptions) bindCommonFlags(flags *flag.FlagSet) {
 func (o *DiagnosticsOptions) bindClientFlags(flags *flag.FlagSet) {
 	o.ClientFlags = flag.NewFlagSet("client", flag.ContinueOnError) // hide the extensive set of client flags
 	o.Factory = osclientcmd.New(o.ClientFlags)                      // that would otherwise be added to this command
-	flags.AddFlag(o.ClientFlags.Lookup(config.OpenShiftConfigFlagName))
+	flags.AddFlag(o.ClientFlags.Lookup(kclientcmd.OpenShiftKubeConfigFlagName))
 	flags.AddFlag(o.ClientFlags.Lookup("context")) // TODO: find k8s constant
 	flags.StringVar(&o.ClientClusterContext, options.FlagClusterContextName, "", "Client context to use for cluster administrator")
 	flags.BoolVar(&o.PreventModification, options.FlagPreventModificationName, false, "If true, may be set to prevent diagnostics making any changes via the API")

pkg/cmd/infra/router/template.go

@@ -763,7 +763,7 @@ func getClientAndMasterVersions(client discovery.DiscoveryInterface, timeout tim
 
 	select {
 	case err, closed := <-done:
-		if strings.HasSuffix(fmt.Sprintf("%v", err), "connection refused") || clientcmd.IsConfigurationMissing(err) || kclientcmd.IsConfigurationInvalid(err) {
+		if strings.HasSuffix(fmt.Sprintf("%v", err), "connection refused") || kclientcmd.IsEmptyConfig(err) || kclientcmd.IsConfigurationInvalid(err) {
 			return nil, nil, err
 		}
 		if closed && err != nil {