github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 13:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Differentiate update/create message on set-context

Browse Source 
kubectl config set-context prints the same message (Context %q set) for both
new and existing contexts. This patch helps differentiate whether an existing
context is modified or a new context is created.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
This commit is contained in:
Ahmet Alp Balkan 2017-05-12 16:57:33 -07:00
parent 7a9c2f7f01
commit f39afd4eeb
No known key found for this signature in database
GPG Key ID: 5C02521D7B216AD6
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubectl/cmd/config/create_context.go
View File

@ -60,8 +60,13 @@ func NewCmdConfigSetContext(out io.Writer, configAccess clientcmd.ConfigAccess)
Example: create_context_example, Example: create_context_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
cmdutil.CheckErr(options.complete(cmd)) cmdutil.CheckErr(options.complete(cmd))
cmdutil.CheckErr(options.run()) exists, err := options.run()
fmt.Fprintf(out, "Context %q set.\n", options.name) cmdutil.CheckErr(err)
if exists {
fmt.Fprintf(out, "Context %q modified.\n", options.name)
} else {
fmt.Fprintf(out, "Context %q created.\n", options.name)
}
}, },
} }
@ -72,15 +77,15 @@ func NewCmdConfigSetContext(out io.Writer, configAccess clientcmd.ConfigAccess)
return cmd return cmd
} }
func (o createContextOptions) run() error { func (o createContextOptions) run() (bool, error) {
err := o.validate() err := o.validate()
if err != nil { if err != nil {
return err return false, err
} }
config, err := o.configAccess.GetStartingConfig() config, err := o.configAccess.GetStartingConfig()
if err != nil { if err != nil {
return err return false, err
} }
startingStanza, exists := config.Contexts[o.name] startingStanza, exists := config.Contexts[o.name]
@ -91,10 +96,10 @@ func (o createContextOptions) run() error {
config.Contexts[o.name] = &context config.Contexts[o.name] = &context
if err := clientcmd.ModifyConfig(o.configAccess, *config, true); err != nil { if err := clientcmd.ModifyConfig(o.configAccess, *config, true); err != nil {
return err return exists, err
} }
return nil return exists, nil
} }
func (o *createContextOptions) modifyContext(existingContext clientcmdapi.Context) clientcmdapi.Context { func (o *createContextOptions) modifyContext(existingContext clientcmdapi.Context) clientcmdapi.Context {

4
pkg/kubectl/cmd/config/create_context_test.go
View File

@ -46,7 +46,7 @@ func TestCreateContext(t *testing.T) {
"--user=user_nickname", "--user=user_nickname",
"--namespace=namespace", "--namespace=namespace",
}, },
expected: `Context "shaker-context" set.` + "\n", expected: `Context "shaker-context" created.` + "\n",
expectedConfig: clientcmdapi.Config{ expectedConfig: clientcmdapi.Config{
Contexts: map[string]*clientcmdapi.Context{ Contexts: map[string]*clientcmdapi.Context{
"shaker-context": {AuthInfo: "user_nickname", Cluster: "cluster_nickname", Namespace: "namespace"}}, "shaker-context": {AuthInfo: "user_nickname", Cluster: "cluster_nickname", Namespace: "namespace"}},
@ -68,7 +68,7 @@ func TestModifyContext(t *testing.T) {
"--user=user_nickname", "--user=user_nickname",
"--namespace=namespace", "--namespace=namespace",
}, },
expected: `Context "shaker-context" set.` + "\n", expected: `Context "shaker-context" modified.` + "\n",
expectedConfig: clientcmdapi.Config{ expectedConfig: clientcmdapi.Config{
Contexts: map[string]*clientcmdapi.Context{ Contexts: map[string]*clientcmdapi.Context{
"shaker-context": {AuthInfo: "user_nickname", Cluster: "cluster_nickname", Namespace: "namespace"}, "shaker-context": {AuthInfo: "user_nickname", Cluster: "cluster_nickname", Namespace: "namespace"},