SOLTYSH: genericclioptions

Author: deads2k

pkg/cmd/infra/router/clientcmd.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -50,15 +51,6 @@ func (cfg *Config) Clients() (kclientset.Interface, error) {
 	return kubeClientset, nil
 }
 
-// BindClientConfigSecurityFlags adds flags for the supplied client config
-func BindClientConfigSecurityFlags(config *restclient.Config, flags *pflag.FlagSet) {
-	flags.BoolVar(&config.Insecure, "insecure-skip-tls-verify", config.Insecure, "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.")
-	flags.StringVar(&config.CertFile, "client-certificate", config.CertFile, "Path to a client certificate file for TLS.")
-	flags.StringVar(&config.KeyFile, "client-key", config.KeyFile, "Path to a client key file for TLS.")
-	flags.StringVar(&config.CAFile, "certificate-authority", config.CAFile, "Path to a cert. file for the certificate authority")
-	flags.StringVar(&config.BearerToken, "token", config.BearerToken, "If present, the bearer token for this request.")
-}
-
 // KubeConfig returns the Kubernetes configuration
 func (cfg *Config) KubeConfig() (*restclient.Config, string, error) {
 	clientConfig, err := cfg.clientConfig.ClientConfig()
@@ -74,8 +66,8 @@ func (cfg *Config) KubeConfig() (*restclient.Config, string, error) {
 
 func DefaultClientConfig(flags *pflag.FlagSet) kclientcmd.ClientConfig {
 	loadingRules := kclientcmd.NewDefaultClientConfigLoadingRules()
-	flags.StringVar(&loadingRules.ExplicitPath, kclientcmd.OpenShiftKubeConfigFlagName, "", "Path to the config file to use for CLI requests.")
-	cobra.MarkFlagFilename(flags, kclientcmd.OpenShiftKubeConfigFlagName)
+	flags.StringVar(&loadingRules.ExplicitPath, genericclioptions.OpenShiftKubeConfigFlagName, "", "Path to the config file to use for CLI requests.")
+	cobra.MarkFlagFilename(flags, genericclioptions.OpenShiftKubeConfigFlagName)
 
 	// set our explicit defaults
 	defaultOverrides := &kclientcmd.ConfigOverrides{ClusterDefaults: kclientcmdapi.Cluster{Server: os.Getenv("KUBERNETES_MASTER")}}

pkg/oc/cli/cli.go

@@ -10,9 +10,12 @@ import (
 	"github.com/openshift/origin/pkg/api/legacygroupification"
 	"github.com/spf13/cobra"
 
+	kclientcmd "k8s.io/client-go/tools/clientcmd"
 	kubecmd "k8s.io/kubernetes/pkg/kubectl/cmd"
+	kcmdset "k8s.io/kubernetes/pkg/kubectl/cmd/set"
 	ktemplates "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/resource"
 
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
@@ -318,6 +321,11 @@ func CommandFor(basename string) *cobra.Command {
 		cmd = kubecmd.NewKubectlCommand(kcmdutil.NewFactory(nil), in, out, errout)
 	default:
 		// we only need this change for `oc`.  `kubectl` should behave as close to `kubectl` as we can
+		// if we call this factory construction method, we want the openshift style config loading
+		genericclioptions.UseOpenShiftKubeConfigValues = true
+		kclientcmd.ErrEmptyConfig = genericclioptions.NewErrConfigurationMissing()
+		kcmdset.ParseDockerImageReferenceToStringFunc = clientcmd.ParseDockerImageReferenceToStringFunc
+
 		resource.OAPIToGroupified = legacygroupification.OAPIToGroupified
 		kcmdutil.OAPIToGroupifiedGVK = legacygroupification.OAPIToGroupifiedGVK
 		cmd = NewCommandCLI("oc", "oc", in, out, errout)

pkg/oc/cli/config/loader.go

@@ -2,21 +2,22 @@ package config
 
 import (
 	"github.com/spf13/cobra"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 
 	kclientcmd "k8s.io/client-go/tools/clientcmd"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 func NewPathOptions(cmd *cobra.Command) *kclientcmd.PathOptions {
-	return NewPathOptionsWithConfig(kcmdutil.GetFlagString(cmd, kclientcmd.OpenShiftKubeConfigFlagName))
+	return NewPathOptionsWithConfig(kcmdutil.GetFlagString(cmd, genericclioptions.OpenShiftKubeConfigFlagName))
 }
 
 func NewPathOptionsWithConfig(configPath string) *kclientcmd.PathOptions {
 	return &kclientcmd.PathOptions{
 		GlobalFile: kclientcmd.RecommendedHomeFile,
 
 		EnvVar:           kclientcmd.RecommendedConfigPathEnvVar,
-		ExplicitFileFlag: kclientcmd.OpenShiftKubeConfigFlagName,
+		ExplicitFileFlag: genericclioptions.OpenShiftKubeConfigFlagName,
 
 		LoadingRules: &kclientcmd.ClientConfigLoadingRules{
 			ExplicitPath: configPath,

pkg/oc/cli/util/clientcmd/factory_client_access.go

@@ -19,7 +19,6 @@ import (
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl"
-	"k8s.io/kubernetes/pkg/kubectl/cmd/set"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 
@@ -35,11 +34,6 @@ type ring0Factory struct {
 }
 
 func NewClientAccessFactory(optionalClientConfig kclientcmd.ClientConfig) kcmdutil.ClientAccessFactory {
-	// if we call this factory construction method, we want the openshift style config loading
-	kclientcmd.UseOpenShiftKubeConfigValues = true
-	kclientcmd.ErrEmptyConfig = kclientcmd.NewErrConfigurationMissing()
-	set.ParseDockerImageReferenceToStringFunc = ParseDockerImageReferenceToStringFunc
-
 	factory := &ring0Factory{
 		kubeClientAccessFactory: kcmdutil.NewClientAccessFactory(optionalClientConfig),
 	}