vendor update for CSI 0.3.0

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/BUILD

@@ -28,8 +28,10 @@ go_library(
         "//build/visible_to:pkg_kubectl_cmd_config_CONSUMERS",
     ],
     deps = [
+        "//pkg/api/legacyscheme:go_default_library",
         "//pkg/kubectl/cmd/templates:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
+        "//pkg/kubectl/genericclioptions:go_default_library",
         "//pkg/kubectl/util/i18n:go_default_library",
         "//pkg/printers:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
@@ -64,6 +66,7 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/util:go_default_library",
+        "//pkg/kubectl/genericclioptions:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/config.go

@@ -18,7 +18,6 @@ package config
 
 import (
 	"fmt"
-	"io"
 	"path"
 	"strconv"
 
@@ -27,11 +26,12 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
 )
 
 // NewCmdConfig creates a command object for the "config" action, and adds all child commands to it.
-func NewCmdConfig(f cmdutil.Factory, pathOptions *clientcmd.PathOptions, out, errOut io.Writer) *cobra.Command {
+func NewCmdConfig(f cmdutil.Factory, pathOptions *clientcmd.PathOptions, streams genericclioptions.IOStreams) *cobra.Command {
 	if len(pathOptions.ExplicitFileFlag) == 0 {
 		pathOptions.ExplicitFileFlag = clientcmd.RecommendedConfigPathFlag
 	}
@@ -48,25 +48,26 @@ func NewCmdConfig(f cmdutil.Factory, pathOptions *clientcmd.PathOptions, out, er
 			1. If the --` + pathOptions.ExplicitFileFlag + ` flag is set, then only that file is loaded.  The flag may only be set once and no merging takes place.
 			2. If $` + pathOptions.EnvVar + ` environment variable is set, then it is used a list of paths (normal path delimitting rules for your system).  These paths are merged.  When a value is modified, it is modified in the file that defines the stanza.  When a value is created, it is created in the first file that exists.  If no files in the chain exist, then it creates the last file in the list.
 			3. Otherwise, ` + path.Join("${HOME}", pathOptions.GlobalFileSubpath) + ` is used and no merging takes place.`),
-		Run: cmdutil.DefaultSubCommandRun(errOut),
+		Run: cmdutil.DefaultSubCommandRun(streams.ErrOut),
 	}
 
 	// file paths are common to all sub commands
 	cmd.PersistentFlags().StringVar(&pathOptions.LoadingRules.ExplicitPath, pathOptions.ExplicitFileFlag, pathOptions.LoadingRules.ExplicitPath, "use a particular kubeconfig file")
 
-	cmd.AddCommand(NewCmdConfigView(f, out, errOut, pathOptions))
-	cmd.AddCommand(NewCmdConfigSetCluster(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigSetAuthInfo(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigSetContext(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigSet(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigUnset(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigCurrentContext(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigUseContext(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigGetContexts(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigGetClusters(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigDeleteCluster(out, pathOptions))
-	cmd.AddCommand(NewCmdConfigDeleteContext(out, errOut, pathOptions))
-	cmd.AddCommand(NewCmdConfigRenameContext(out, pathOptions))
+	// TODO(juanvallejo): update all subcommands to work with genericclioptions.IOStreams
+	cmd.AddCommand(NewCmdConfigView(f, streams, pathOptions))
+	cmd.AddCommand(NewCmdConfigSetCluster(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigSetAuthInfo(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigSetContext(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigSet(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigUnset(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigCurrentContext(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigUseContext(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigGetContexts(streams, pathOptions))
+	cmd.AddCommand(NewCmdConfigGetClusters(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigDeleteCluster(streams.Out, pathOptions))
+	cmd.AddCommand(NewCmdConfigDeleteContext(streams.Out, streams.ErrOut, pathOptions))
+	cmd.AddCommand(NewCmdConfigRenameContext(streams.Out, pathOptions))
 
 	return cmd
 }

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/config_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package config
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -31,6 +30,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 )
 
 func newRedFederalCowHammerConfig() clientcmdapi.Config {
@@ -863,15 +863,14 @@ func testConfigCommand(args []string, startingConfig clientcmdapi.Config, t *tes
 	argsToUse = append(argsToUse, "--kubeconfig="+fakeKubeFile.Name())
 	argsToUse = append(argsToUse, args...)
 
-	buf := bytes.NewBuffer([]byte{})
-
-	cmd := NewCmdConfig(cmdutil.NewFactory(nil), clientcmd.NewDefaultPathOptions(), buf, buf)
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCmdConfig(cmdutil.NewFactory(genericclioptions.NewTestConfigFlags()), clientcmd.NewDefaultPathOptions(), streams)
+	// "context" is a global flag, inherited from base kubectl command in the real world
+	cmd.PersistentFlags().String("context", "", "The name of the kubeconfig context to use")
 	cmd.SetArgs(argsToUse)
 	cmd.Execute()
 
-	// outBytes, _ := ioutil.ReadFile(fakeKubeFile.Name())
 	config := clientcmd.GetConfigFromFileOrDie(fakeKubeFile.Name())
-
 	return buf.String(), *config
 }
 

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/create_authinfo_test.go

@@ -142,7 +142,7 @@ func TestCreateAuthInfoOptions(t *testing.T) {
 		},
 		{
 			flags: []string{
-			// No name for authinfo provided.
+				// No name for authinfo provided.
 			},
 			wantCompleteErr: true,
 		},

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/get_contexts.go

@@ -31,6 +31,7 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
 	"k8s.io/kubernetes/pkg/printers"
 )
@@ -41,7 +42,8 @@ type GetContextsOptions struct {
 	nameOnly     bool
 	showHeaders  bool
 	contextNames []string
-	out          io.Writer
+
+	genericclioptions.IOStreams
 }
 
 var (
@@ -57,8 +59,12 @@ var (
 
 // NewCmdConfigGetContexts creates a command object for the "get-contexts" action, which
 // retrieves one or more contexts from a kubeconfig.
-func NewCmdConfigGetContexts(out io.Writer, configAccess clientcmd.ConfigAccess) *cobra.Command {
-	options := &GetContextsOptions{configAccess: configAccess}
+func NewCmdConfigGetContexts(streams genericclioptions.IOStreams, configAccess clientcmd.ConfigAccess) *cobra.Command {
+	options := &GetContextsOptions{
+		configAccess: configAccess,
+
+		IOStreams: streams,
+	}
 
 	cmd := &cobra.Command{
 		Use: "get-contexts [(-o|--output=)name)]",
@@ -74,22 +80,22 @@ func NewCmdConfigGetContexts(out io.Writer, configAccess clientcmd.ConfigAccess)
 				cmdutil.CheckErr(fmt.Errorf("output must be one of '' or 'name': %v", outputFormat))
 			}
 			if !supportedOutputTypes.Has(outputFormat) {
-				fmt.Fprintf(out, "--output %v is not available in kubectl config get-contexts; resetting to default output format\n", outputFormat)
+				fmt.Fprintf(options.Out, "--output %v is not available in kubectl config get-contexts; resetting to default output format\n", outputFormat)
 				cmd.Flags().Set("output", "")
 			}
-			cmdutil.CheckErr(options.Complete(cmd, args, out))
+			cmdutil.CheckErr(options.Complete(cmd, args))
 			cmdutil.CheckErr(options.RunGetContexts())
 		},
 	}
-	cmdutil.AddOutputFlags(cmd)
-	cmdutil.AddNoHeadersFlags(cmd)
+
+	cmd.Flags().Bool("no-headers", false, "When using the default or custom-column output format, don't print headers (default print headers).")
+	cmd.Flags().StringP("output", "o", "", "Output format. One of: name")
 	return cmd
 }
 
 // Complete assigns GetContextsOptions from the args.
-func (o *GetContextsOptions) Complete(cmd *cobra.Command, args []string, out io.Writer) error {
+func (o *GetContextsOptions) Complete(cmd *cobra.Command, args []string) error {
 	o.contextNames = args
-	o.out = out
 	o.nameOnly = false
 	if cmdutil.GetFlagString(cmd, "output") == "name" {
 		o.nameOnly = true
@@ -109,9 +115,9 @@ func (o GetContextsOptions) RunGetContexts() error {
 		return err
 	}
 
-	out, found := o.out.(*tabwriter.Writer)
+	out, found := o.Out.(*tabwriter.Writer)
 	if !found {
-		out = printers.GetNewTabWriter(o.out)
+		out = printers.GetNewTabWriter(o.Out)
 		defer out.Flush()
 	}
 

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/get_contexts_test.go

@@ -17,13 +17,13 @@ limitations under the License.
 package config
 
 import (
-	"bytes"
 	"io/ioutil"
 	"os"
 	"testing"
 
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 )
 
 type getContextsTest struct {
@@ -157,11 +157,11 @@ func (test getContextsTest) run(t *testing.T) {
 	pathOptions := clientcmd.NewDefaultPathOptions()
 	pathOptions.GlobalFile = fakeKubeFile.Name()
 	pathOptions.EnvVar = ""
-	buf := bytes.NewBuffer([]byte{})
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	options := GetContextsOptions{
 		configAccess: pathOptions,
 	}
-	cmd := NewCmdConfigGetContexts(buf, options.configAccess)
+	cmd := NewCmdConfigGetContexts(streams, options.configAccess)
 	if test.nameOnly {
 		cmd.Flags().Set("output", "name")
 	}

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/set.go

@@ -33,11 +33,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
 )
 
-const (
-	cannotHaveStepsAfterError                = "Cannot have steps after %v.  %v are remaining"
-	additionStepRequiredUnlessUnsettingError = "Must have additional steps after %v unless you are unsetting it"
-)
-
 type setOptions struct {
 	configAccess  clientcmd.ConfigAccess
 	propertyName  string

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/view.go

@@ -18,8 +18,6 @@ package config
 
 import (
 	"errors"
-	"fmt"
-	"io"
 
 	"github.com/spf13/cobra"
 
@@ -27,18 +25,28 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/client-go/tools/clientcmd/api/latest"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
 	"k8s.io/kubernetes/pkg/printers"
 )
 
 type ViewOptions struct {
+	PrintFlags  *genericclioptions.PrintFlags
+	PrintObject printers.ResourcePrinterFunc
+
 	ConfigAccess clientcmd.ConfigAccess
 	Merge        flag.Tristate
 	Flatten      bool
 	Minify       bool
 	RawByteData  bool
+
+	Context      string
+	OutputFormat string
+
+	genericclioptions.IOStreams
 }
 
 var (
@@ -48,17 +56,25 @@ var (
 		You can use --output jsonpath={...} to extract specific values using a jsonpath expression.`)
 
 	view_example = templates.Examples(`
-		# Show Merged kubeconfig settings.
+		# Show merged kubeconfig settings.
 		kubectl config view
 
+		# Show merged kubeconfig settings and raw certificate data.
+		kubectl config view --raw
+
 		# Get the password for the e2e user
 		kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'`)
+
+	defaultOutputFormat = "yaml"
 )
 
-func NewCmdConfigView(f cmdutil.Factory, out, errOut io.Writer, ConfigAccess clientcmd.ConfigAccess) *cobra.Command {
-	options := &ViewOptions{ConfigAccess: ConfigAccess}
-	// Default to yaml
-	defaultOutputFormat := "yaml"
+func NewCmdConfigView(f cmdutil.Factory, streams genericclioptions.IOStreams, ConfigAccess clientcmd.ConfigAccess) *cobra.Command {
+	o := &ViewOptions{
+		PrintFlags:   genericclioptions.NewPrintFlags("").WithTypeSetter(legacyscheme.Scheme).WithDefaultOutput("yaml"),
+		ConfigAccess: ConfigAccess,
+
+		IOStreams: streams,
+	}
 
 	cmd := &cobra.Command{
 		Use:     "view",
@@ -66,46 +82,58 @@ func NewCmdConfigView(f cmdutil.Factory, out, errOut io.Writer, ConfigAccess cli
 		Long:    view_long,
 		Example: view_example,
 		Run: func(cmd *cobra.Command, args []string) {
-			options.Complete()
-			outputFormat := cmdutil.GetFlagString(cmd, "output")
-			if outputFormat == "wide" {
-				fmt.Fprintf(errOut, "--output wide is not available in kubectl config view; reset to default output format (%s)\n\n", defaultOutputFormat)
-				// TODO: once printing is abstracted, this should be handled at flag declaration time
-				cmd.Flags().Set("output", defaultOutputFormat)
-			}
-			if outputFormat == "" {
-				fmt.Fprintf(errOut, "Reset to default output format (%s) as --output is empty\n", defaultOutputFormat)
-				// TODO: once printing is abstracted, this should be handled at flag declaration time
-				cmd.Flags().Set("output", defaultOutputFormat)
-			}
-
-			printOpts := cmdutil.ExtractCmdPrintOptions(cmd, false)
-			printer, err := cmdutil.PrinterForOptions(printOpts)
-			cmdutil.CheckErr(err)
-
-			cmdutil.CheckErr(options.Run(out, printer))
+			cmdutil.CheckErr(o.Complete(cmd))
+			cmdutil.CheckErr(o.Validate())
+			cmdutil.CheckErr(o.Run())
 		},
 	}
 
-	cmdutil.AddPrinterFlags(cmd)
-	cmd.Flags().Set("output", defaultOutputFormat)
+	o.PrintFlags.AddFlags(cmd)
 
-	options.Merge.Default(true)
-	mergeFlag := cmd.Flags().VarPF(&options.Merge, "merge", "", "Merge the full hierarchy of kubeconfig files")
+	o.Merge.Default(true)
+	mergeFlag := cmd.Flags().VarPF(&o.Merge, "merge", "", "Merge the full hierarchy of kubeconfig files")
 	mergeFlag.NoOptDefVal = "true"
-	cmd.Flags().BoolVar(&options.RawByteData, "raw", false, "Display raw byte data")
-	cmd.Flags().BoolVar(&options.Flatten, "flatten", false, "Flatten the resulting kubeconfig file into self-contained output (useful for creating portable kubeconfig files)")
-	cmd.Flags().BoolVar(&options.Minify, "minify", false, "Remove all information not used by current-context from the output")
+	cmd.Flags().BoolVar(&o.RawByteData, "raw", o.RawByteData, "Display raw byte data")
+	cmd.Flags().BoolVar(&o.Flatten, "flatten", o.Flatten, "Flatten the resulting kubeconfig file into self-contained output (useful for creating portable kubeconfig files)")
+	cmd.Flags().BoolVar(&o.Minify, "minify", o.Minify, "Remove all information not used by current-context from the output")
 	return cmd
 }
 
-func (o ViewOptions) Run(out io.Writer, printer printers.ResourcePrinter) error {
+func (o *ViewOptions) Complete(cmd *cobra.Command) error {
+	if o.ConfigAccess.IsExplicitFile() {
+		if !o.Merge.Provided() {
+			o.Merge.Set("false")
+		}
+	}
+
+	printer, err := o.PrintFlags.ToPrinter()
+	if err != nil {
+		return err
+	}
+	o.PrintObject = printer.PrintObj
+	o.Context = cmdutil.GetFlagString(cmd, "context")
+
+	return nil
+}
+
+func (o ViewOptions) Validate() error {
+	if !o.Merge.Value() && !o.ConfigAccess.IsExplicitFile() {
+		return errors.New("if merge==false a precise file must to specified")
+	}
+
+	return nil
+}
+
+func (o ViewOptions) Run() error {
 	config, err := o.loadConfig()
 	if err != nil {
 		return err
 	}
 
 	if o.Minify {
+		if len(o.Context) > 0 {
+			config.CurrentContext = o.Context
+		}
 		if err := clientcmdapi.MinifyConfig(config); err != nil {
 			return err
 		}
@@ -124,22 +152,7 @@ func (o ViewOptions) Run(out io.Writer, printer printers.ResourcePrinter) error
 		return err
 	}
 
-	err = printer.PrintObj(convertedObj, out)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (o *ViewOptions) Complete() bool {
-	if o.ConfigAccess.IsExplicitFile() {
-		if !o.Merge.Provided() {
-			o.Merge.Set("false")
-		}
-	}
-
-	return true
+	return o.PrintObject(convertedObj, o.Out)
 }
 
 func (o ViewOptions) loadConfig() (*clientcmdapi.Config, error) {
@@ -152,14 +165,6 @@ func (o ViewOptions) loadConfig() (*clientcmdapi.Config, error) {
 	return config, err
 }
 
-func (o ViewOptions) Validate() error {
-	if !o.Merge.Value() && !o.ConfigAccess.IsExplicitFile() {
-		return errors.New("if merge==false a precise file must to specified")
-	}
-
-	return nil
-}
-
 // 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, error) {
 	switch {

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/view_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package config
 
 import (
-	"bytes"
 	"io/ioutil"
 	"os"
 	"testing"
@@ -25,6 +24,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 )
 
 type viewClusterTest struct {
@@ -43,19 +43,19 @@ func TestViewCluster(t *testing.T) {
 			"my-cluster": {Server: "https://192.168.0.1:3434"},
 		},
 		Contexts: map[string]*clientcmdapi.Context{
-			"minikube":  {AuthInfo: "minikube", Cluster: "minikube"},
-			"my-cluser": {AuthInfo: "mu-cluster", Cluster: "my-cluster"},
+			"minikube":   {AuthInfo: "minikube", Cluster: "minikube"},
+			"my-cluster": {AuthInfo: "mu-cluster", Cluster: "my-cluster"},
 		},
 		CurrentContext: "minikube",
 		AuthInfos: map[string]*clientcmdapi.AuthInfo{
-			"minikube":  {Token: "minikube-token"},
-			"my-cluser": {Token: "minikube-token"},
+			"minikube":   {Token: "minikube-token"},
+			"mu-cluster": {Token: "minikube-token"},
 		},
 	}
+
 	test := viewClusterTest{
 		description: "Testing for kubectl config view",
 		config:      conf,
-		flags:       []string{},
 		expected: `apiVersion: v1
 clusters:
 - cluster:
@@ -72,7 +72,7 @@ contexts:
 - context:
     cluster: my-cluster
     user: mu-cluster
-  name: my-cluser
+  name: my-cluster
 current-context: minikube
 kind: Config
 preferences: {}
@@ -80,10 +80,13 @@ users:
 - name: minikube
   user:
     token: minikube-token
-- name: my-cluser
+- name: mu-cluster
   user:
-    token: minikube-token` + "\n"}
+    token: minikube-token` + "\n",
+	}
+
 	test.run(t)
+
 }
 
 func TestViewClusterMinify(t *testing.T) {
@@ -95,20 +98,27 @@ func TestViewClusterMinify(t *testing.T) {
 			"my-cluster": {Server: "https://192.168.0.1:3434"},
 		},
 		Contexts: map[string]*clientcmdapi.Context{
-			"minikube":  {AuthInfo: "minikube", Cluster: "minikube"},
-			"my-cluser": {AuthInfo: "mu-cluster", Cluster: "my-cluster"},
+			"minikube":   {AuthInfo: "minikube", Cluster: "minikube"},
+			"my-cluster": {AuthInfo: "mu-cluster", Cluster: "my-cluster"},
 		},
 		CurrentContext: "minikube",
 		AuthInfos: map[string]*clientcmdapi.AuthInfo{
-			"minikube":  {Token: "minikube-token"},
-			"my-cluser": {Token: "minikube-token"},
+			"minikube":   {Token: "minikube-token"},
+			"mu-cluster": {Token: "minikube-token"},
 		},
 	}
-	test := viewClusterTest{
-		description: "Testing for kubectl config view --minify=true",
-		config:      conf,
-		flags:       []string{"--minify=true"},
-		expected: `apiVersion: v1
+
+	testCases := []struct {
+		description string
+		config      clientcmdapi.Config
+		flags       []string
+		expected    string
+	}{
+		{
+			description: "Testing for kubectl config view --minify=true",
+			config:      conf,
+			flags:       []string{"--minify=true"},
+			expected: `apiVersion: v1
 clusters:
 - cluster:
     server: https://192.168.99.100:8443
@@ -124,8 +134,41 @@ preferences: {}
 users:
 - name: minikube
   user:
-    token: minikube-token` + "\n"}
-	test.run(t)
+    token: minikube-token` + "\n",
+		},
+		{
+			description: "Testing for kubectl config view --minify=true --context=my-cluster",
+			config:      conf,
+			flags:       []string{"--minify=true", "--context=my-cluster"},
+			expected: `apiVersion: v1
+clusters:
+- cluster:
+    server: https://192.168.0.1:3434
+  name: my-cluster
+contexts:
+- context:
+    cluster: my-cluster
+    user: mu-cluster
+  name: my-cluster
+current-context: my-cluster
+kind: Config
+preferences: {}
+users:
+- name: mu-cluster
+  user:
+    token: minikube-token` + "\n",
+		},
+	}
+
+	for _, test := range testCases {
+		cmdTest := viewClusterTest{
+			description: test.description,
+			config:      test.config,
+			flags:       test.flags,
+			expected:    test.expected,
+		}
+		cmdTest.run(t)
+	}
 }
 
 func (test viewClusterTest) run(t *testing.T) {
@@ -141,10 +184,12 @@ func (test viewClusterTest) run(t *testing.T) {
 	pathOptions := clientcmd.NewDefaultPathOptions()
 	pathOptions.GlobalFile = fakeKubeFile.Name()
 	pathOptions.EnvVar = ""
-	buf := bytes.NewBuffer([]byte{})
-	errBuf := bytes.NewBuffer([]byte{})
-	cmd := NewCmdConfigView(cmdutil.NewFactory(nil), buf, errBuf, pathOptions)
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCmdConfigView(cmdutil.NewFactory(genericclioptions.NewTestConfigFlags()), streams, pathOptions)
+	// "context" is a global flag, inherited from base kubectl command in the real world
+	cmd.Flags().String("context", "", "The name of the kubeconfig context to use")
 	cmd.Flags().Parse(test.flags)
+
 	if err := cmd.Execute(); err != nil {
 		t.Fatalf("unexpected error executing command: %v,kubectl config view flags: %v", err, test.flags)
 	}