From 4f36c82ff771543af6d6010ce41287cdd2f659e7 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 3 Feb 2022 09:00:24 -0800 Subject: [PATCH] Check for `--kubeconfig` flag with embedded `kubectl` (#5064) * Check for kubeconfig flag Signed-off-by: Derek Nola --- pkg/kubectl/main.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/kubectl/main.go b/pkg/kubectl/main.go index e864db0dce..ba98324536 100644 --- a/pkg/kubectl/main.go +++ b/pkg/kubectl/main.go @@ -5,6 +5,7 @@ import ( "fmt" "math/rand" "os" + "strings" "time" "github.com/rancher/k3s/pkg/server" @@ -17,6 +18,13 @@ import ( func Main() { kubenv := os.Getenv("KUBECONFIG") + for i, arg := range os.Args { + if strings.HasPrefix(arg, "--kubeconfig=") { + kubenv = strings.Split(arg, "=")[1] + } else if strings.HasPrefix(arg, "--kubeconfig") && i+1 < len(os.Args) { + kubenv = os.Args[i+1] + } + } if kubenv == "" { config, err := server.HomeKubeConfig(false, false) if _, serr := os.Stat(config); err == nil && serr == nil {