feat(config): Set current context

clevyr · Oct 25, 2023 · ad780eb · ad780eb
1 parent 82bb489
commit ad780eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/internal/kubernetes/client.go b/internal/kubernetes/client.go
@@ -18,6 +18,7 @@ type KubeClient struct {
 	ClientSet    kubernetes.Interface
 	ClientConfig *rest.Config
 	Discovery    *discovery.DiscoveryClient
+	Context      string
 	Namespace    string
 }
 
@@ -56,6 +57,10 @@ func NewConfigLoader(kubeconfig, context string) clientcmd.ClientConfig {
 func NewClient(kubeconfig, context, namespace string) (config KubeClient, err error) {
 	configLoader := NewConfigLoader(kubeconfig, context)
 
+	if rawConfig, err := configLoader.RawConfig(); err == nil {
+		config.Context = rawConfig.CurrentContext
+	}
+
 	config.ClientConfig, err = configLoader.ClientConfig()
 	if err != nil {
 		return config, err

diff --git a/internal/util/cmd_setup.go b/internal/util/cmd_setup.go
@@ -46,6 +46,7 @@ func DefaultSetup(cmd *cobra.Command, conf *config.Global, opts SetupOptions) (e
 		return err
 	}
 	log.WithField("namespace", conf.Client.Namespace).Debug("created kube client")
+	conf.Context = conf.Client.Context
 	conf.Namespace = conf.Client.Namespace
 
 	access := config.NewNamespaceRegexp(cmd.Annotations["access"])