Merge remote-tracking branch 'origin/registermember' into registermember

kubesaw · Aug 1, 2024 · 069eab6 · 069eab6
2 parents d9e599c + 15ba333
commit 069eab6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/cmd/adm/register_member.go b/pkg/cmd/adm/register_member.go
@@ -79,7 +79,12 @@ func NewRegisterMemberCmd() *cobra.Command {
 	}
 
 	defaultKubeConfigPath := ""
-	if home := homedir.HomeDir(); home != "" {
+
+	// first check if KUBECONFIG env variable is set
+	if kubeconfigPath := os.Getenv("KUBECONFIG"); kubeconfigPath != "" {
+		defaultKubeConfigPath = kubeconfigPath
+	} else if home := homedir.HomeDir(); home != "" {
+		// use home kubeconfig if no KUBECONFIG env var was set
 		defaultKubeConfigPath = filepath.Join(home, ".kube", "config")
 	}