From 3e54a93ee4e5a9881ecd206c53d72114a3444260 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 23 Jan 2020 14:17:25 +0100 Subject: [PATCH 1/2] fix(cli): server from context on env add --- cmd/tk/env.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/tk/env.go b/cmd/tk/env.go index fe8bf016c..dab7bec6a 100644 --- a/cmd/tk/env.go +++ b/cmd/tk/env.go @@ -124,6 +124,14 @@ func envAddCmd() *cobra.Command { cfg := v1alpha1.New() envSettingsFlags(cfg, cmd.Flags()) cmd.Run = func(cmd *cobra.Command, args []string) { + if cmd.Flags().Changed("server-from-context") { + server, err := client.IPFromContext(tmp.Spec.APIServer) + if err != nil { + log.Fatalf("Resolving IP from context: %s", err) + } + cfg.Spec.APIServer = server + } + if err := addEnv(args[0], cfg); err != nil { log.Fatalln(err) } From c7b10213cb913b1f4718979272bf57bd1065e4d0 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 23 Jan 2020 14:20:53 +0100 Subject: [PATCH 2/2] Update env.go --- cmd/tk/env.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/tk/env.go b/cmd/tk/env.go index dab7bec6a..8887007bd 100644 --- a/cmd/tk/env.go +++ b/cmd/tk/env.go @@ -125,7 +125,7 @@ func envAddCmd() *cobra.Command { envSettingsFlags(cfg, cmd.Flags()) cmd.Run = func(cmd *cobra.Command, args []string) { if cmd.Flags().Changed("server-from-context") { - server, err := client.IPFromContext(tmp.Spec.APIServer) + server, err := client.IPFromContext(cfg.Spec.APIServer) if err != nil { log.Fatalf("Resolving IP from context: %s", err) }