🐻‍❄️ update kubeconfig load options

zcubbs · Oct 1, 2023 · f7a2030 · f7a2030
1 parent 64564cb
commit f7a2030
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cmd/awx/awx.go b/cmd/awx/awx.go
@@ -28,7 +28,7 @@ type OperatorConfig struct {
 	HelmRepoURL   string `mapstructure:"helm_repo_url" json:"helm_repo_url"`
 	HelmRepoName  string `mapstructure:"helm_repo_name" json:"helm_repo_name"`
 	HelmChartName string `mapstructure:"helm_chart_name" json:"helm_chart_name"`
-	HelmRelease   string `mapstructure:"helm_release" json:"helm_release"`
+	HelmRelease   string `mapstructure:"helm_release_name" json:"helm_release_name"`
 }
 
 type InstanceConfig struct {

diff --git a/cmd/awx/kubeconfig.go b/cmd/awx/kubeconfig.go
@@ -26,6 +26,17 @@ func getKubeConfig(path string, debug bool) (string, error) {
 		return kc, nil
 	}
 
+	kc = "/etc/rancher/k3s/k3s.yaml"
+	fi, err = os.Stat(kc)
+	os.IsNotExist(err)
+	if err != nil && debug {
+		fmt.Printf("kubeconfig not found in default location %s\n", kc)
+	}
+
+	if fi != nil {
+		return kc, nil
+	}
+
 	kc = os.Getenv("KUBECONFIG")
 	if kc == "" {
 		return "", fmt.Errorf("kubeconfig not found")