github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4662 from deads2k/deads-global-local-override-merge

Browse Source 
prevent default merging when specifying a specific kubeconfig for config view
This commit is contained in:
Satnam Singh 2015-02-20 09:51:44 -08:00
commit 1704319edb
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/kubectl/cmd/config/view.go
View File

@ -26,12 +26,13 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
type viewOptions struct { type viewOptions struct {
pathOptions *pathOptions pathOptions *pathOptions
merge bool merge util.BoolFlag
} }
func NewCmdConfigView(out io.Writer, pathOptions *pathOptions) *cobra.Command { func NewCmdConfigView(out io.Writer, pathOptions *pathOptions) *cobra.Command {
@ -48,7 +49,9 @@ Examples:
// Show only local ./.kubeconfig settings // Show only local ./.kubeconfig settings
$ kubectl config view --local`, $ kubectl config view --local`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
printer, _, err := util.PrinterForCommand(cmd) options.complete()
printer, _, err := cmdutil.PrinterForCommand(cmd)
if err != nil { if err != nil {
glog.FatalDepth(1, err) glog.FatalDepth(1, err)
} }
@ -63,13 +66,26 @@ Examples:
}, },
} }
util.AddPrinterFlags(cmd) cmdutil.AddPrinterFlags(cmd)
// Default to yaml // Default to yaml
cmd.Flags().Set("output", "yaml") cmd.Flags().Set("output", "yaml")
cmd.Flags().BoolVar(&options.merge, "merge", true, "merge together the full hierarchy of .kubeconfig files")
options.merge.Default(true)
cmd.Flags().Var(&options.merge, "merge", "merge together the full hierarchy of .kubeconfig files")
return cmd return cmd
} }
func (o *viewOptions) complete() bool {
// if --kubeconfig, --global, or --local is specified, then merging doesn't make sense since you're declaring precise intent
if (len(o.pathOptions.specifiedFile) > 0) || o.pathOptions.global || o.pathOptions.local {
if !o.merge.Provided() {
o.merge.Set("false")
}
}
return true
}
func (o viewOptions) loadConfig() (*clientcmdapi.Config, error) { func (o viewOptions) loadConfig() (*clientcmdapi.Config, error) {
err := o.validate() err := o.validate()
if err != nil { if err != nil {
@ -87,7 +103,7 @@ func (o viewOptions) validate() error {
// getStartingConfig returns the Config object built from the sources specified by the options, the filename read (only if it was a single file), and an error if something goes wrong // getStartingConfig returns the Config object built from the sources specified by the options, the filename read (only if it was a single file), and an error if something goes wrong
func (o *viewOptions) getStartingConfig() (*clientcmdapi.Config, string, error) { func (o *viewOptions) getStartingConfig() (*clientcmdapi.Config, string, error) {
switch { switch {
case o.merge: case o.merge.Value():
loadingRules := clientcmd.NewClientConfigLoadingRules() loadingRules := clientcmd.NewClientConfigLoadingRules()
loadingRules.EnvVarPath = os.Getenv("KUBECONFIG") loadingRules.EnvVarPath = os.Getenv("KUBECONFIG")
loadingRules.CommandLinePath = o.pathOptions.specifiedFile loadingRules.CommandLinePath = o.pathOptions.specifiedFile