From 5a9a5ff616194d9a1f7c7c4bb8d6a197c5da9c5c Mon Sep 17 00:00:00 2001 From: Girish Ramnani Date: Tue, 1 Jun 2021 16:24:28 +0530 Subject: [PATCH] replace / path operator with filepath.join for CheckKubeConfigExist --- pkg/util/util.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/util/util.go b/pkg/util/util.go index 82425894..a65fc515 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -35,6 +35,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" kvalidation "k8s.io/apimachinery/pkg/util/validation" + "k8s.io/client-go/util/homedir" "k8s.io/klog" ) @@ -1071,8 +1072,13 @@ func CheckKubeConfigExist() bool { if os.Getenv("KUBECONFIG") != "" { kubeconfig = os.Getenv("KUBECONFIG") } else { - home, _ := os.UserHomeDir() - kubeconfig = fmt.Sprintf("%s/.kube/config", home) + if home := homedir.HomeDir(); home != "" { + kubeconfig = filepath.Join(home, ".kube", "config") + klog.V(4).Infof("using default kubeconfig path %s", kubeconfig) + } else { + klog.V(4).Infof("no KUBECONFIG provided and cannot fallback to default") + return false + } } if CheckPathExists(kubeconfig) {