Merge pull request #478 from Rui-Tang/bug-config

check  while ~/.kube/config is missing

pkg/cli/job/common.go

@@ -30,9 +30,13 @@ type commonFlags struct {
 func initFlags(cmd *cobra.Command, cf *commonFlags) {
 	cmd.Flags().StringVarP(&cf.Master, "master", "s", "", "the address of apiserver")
 
-	if home := homeDir(); home != "" {
-		cmd.Flags().StringVarP(&cf.Kubeconfig, "kubeconfig", "k", filepath.Join(home, ".kube", "config"), "(optional) absolute path to the kubeconfig file")
+	if defaultKubeConfigFile := filepath.Join(homeDir(), ".kube", "config"); checkFileExist(defaultKubeConfigFile) {
+		cmd.Flags().StringVarP(&cf.Kubeconfig, "kubeconfig", "k", defaultKubeConfigFile, "(optional) absolute path to the kubeconfig file")
+	} else if kubeConfig := kubeConfig(); kubeConfig != "" {
+		//Default kubeconfig file is located in $HOME/.kube/config . In case this file does not exist, it will look for $KUBECONFIG instead.
+		cmd.Flags().StringVarP(&cf.Kubeconfig, "kubeconfig", "k", kubeConfig, "(optional) absolute path to the kubeconfig file")
 	} else {
 		cmd.Flags().StringVarP(&cf.Kubeconfig, "kubeconfig", "k", "", "(optional) absolute path to the kubeconfig file")
 	}
+
 }

pkg/cli/job/util.go

@@ -35,6 +35,20 @@ import (
 	"volcano.sh/volcano/pkg/client/clientset/versioned"
 )
 
+func checkFileExist(filePath string) bool {
+	if file, err := os.Stat(filePath); err == nil && !file.IsDir() {
+		return true
+	}
+	return false
+}
+
+func kubeConfig() string {
+	if config := os.Getenv("KUBECONFIG"); config != "" {
+		return config
+	}
+	return ""
+}
+
 func homeDir() string {
 	if h := os.Getenv("HOME"); h != "" {
 		return h