Honour Local path flag while saving kube configs

civo · May 8, 2024 · 5ee9938 · 5ee9938
1 parent 7017fa6
commit 5ee9938
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmd/kubernetes/kubernetes_config.go b/cmd/kubernetes/kubernetes_config.go
@@ -27,6 +27,7 @@ Notes:
 
 var saveConfig, switchConfig, overwriteConfig bool
 var localPathConfig string
+var defaultKubeConfigPath = "/.kube/config"
 
 var kubernetesConfigCmd = &cobra.Command{
  Use: "config",
@@ -65,8 +66,12 @@ If you wish to use a custom format, the available fields are:
  os.Exit(1)
  }
 
- if os.Getenv("KUBECONFIG") != "" {
- localPathConfig = os.Getenv("KUBECONFIG")
+ if localPathConfig == "" { // Check if -p or --local-path argument was not provided
+ if os.Getenv("KUBECONFIG") != "" {
+ localPathConfig = os.Getenv("KUBECONFIG")
+ } else {
+ localPathConfig = defaultKubeConfigPath
+ }
  }
 
  if saveConfig {

diff --git a/utility/kubernetes.go b/utility/kubernetes.go
@@ -176,7 +176,7 @@ func checkAppPlan(appList []civogo.KubernetesMarketplaceApplication, requested s
  return requested, nil
 }
 
-// RequestedSplit is a function to split all app requested to be install
+// RequestedSplit is a function to split all app requested to be installed
 func RequestedSplit(appList []civogo.KubernetesMarketplaceApplication, requested string) string {
  allsplit := strings.Split(requested, ",")
  allApp := []string{}