feat: use binary-name instead of .binary-name (#224)

inside the .config we should be using binary-name and not .binary-name.

Author: ricardomaraschini

e2e/scripts/embed-and-install.sh

@@ -143,6 +143,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/.embedded-cluster/etc/kubeconfig
-export PATH=$PATH:/root/.config/.embedded-cluster/bin
+export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export PATH=$PATH:/root/.config/embedded-cluster/bin
 main

e2e/scripts/embedded-preflight.sh

@@ -189,6 +189,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/.embedded-cluster/etc/kubeconfig
-export PATH=$PATH:/root/.config/.embedded-cluster/bin
+export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export PATH=$PATH:/root/.config/embedded-cluster/bin
 main

e2e/scripts/install-with-disabled-addons.sh

@@ -94,6 +94,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/.embedded-cluster/etc/kubeconfig
-export PATH=$PATH:/root/.config/.embedded-cluster/bin
+export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export PATH=$PATH:/root/.config/embedded-cluster/bin
 main

e2e/scripts/single-node-install.sh

@@ -87,6 +87,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/.embedded-cluster/etc/kubeconfig
-export PATH=$PATH:/root/.config/.embedded-cluster/bin
+export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export PATH=$PATH:/root/.config/embedded-cluster/bin
 main

e2e/scripts/unsupported-overrides.sh

@@ -72,7 +72,7 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/.embedded-cluster/etc/kubeconfig
-export K0SCTLCONFIG=/root/.config/.embedded-cluster/etc/k0sctl.yaml
-export PATH=$PATH:/root/.config/.embedded-cluster/bin
+export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export K0SCTLCONFIG=/root/.config/embedded-cluster/etc/k0sctl.yaml
+export PATH=$PATH:/root/.config/embedded-cluster/bin
 main

e2e/scripts/wait-for-ready-nodes.sh

@@ -22,6 +22,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/.embedded-cluster/etc/kubeconfig
-export PATH=$PATH:/root/.config/.embedded-cluster/bin
+export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export PATH=$PATH:/root/.config/embedded-cluster/bin
 main "$@"

pkg/defaults/provider.go

@@ -71,17 +71,14 @@ func (d *Provider) config() string {
 	if err != nil {
 		logrus.Fatalf("unable to get user home dir: %s", err)
 	}
-
 	// use the XDG_CONFIG_HOME environment variable if set
 	if xdgConfigHome := os.Getenv("XDG_CONFIG_HOME"); xdgConfigHome != "" {
 		return xdgConfigHome
 	}
-
 	// otherwise, default to $HOME/.config on linux
 	if runtime.GOOS == "linux" {
 		return filepath.Join(home, ".config")
 	}
-
 	return home
 }
 
@@ -119,10 +116,9 @@ func (d *Provider) BinaryName() string {
 }
 
 // EmbeddedClusterLogsSubDir returns the path to the directory where embedded-cluster logs are
-// stored. This is a subdirectory of the user's home directory.
+// stored.
 func (d *Provider) EmbeddedClusterLogsSubDir() string {
-	hidden := fmt.Sprintf(".%s", d.BinaryName())
-	return filepath.Join(d.Base, d.state(), hidden, "logs")
+	return filepath.Join(d.Base, d.state(), d.BinaryName(), "logs")
 }
 
 // PathToLog returns the full path to a log file. This function does not check
@@ -140,15 +136,13 @@ func (d *Provider) K0sctlBinsSubDir() string {
 
 // HelmChartSubDir returns the path to the directory where helm charts are stored
 func (d *Provider) HelmChartSubDir() string {
-	hidden := fmt.Sprintf(".%s", d.BinaryName())
-	return filepath.Join(d.Base, d.home(), hidden, "charts")
+	return filepath.Join(d.Base, d.config(), d.BinaryName(), "charts")
 }
 
 // EmbeddedClusterBinsSubDir returns the path to the directory where embedded-cluster binaries
-// are stored. This is a subdirectory of the user's home directory.
+// are stored.
 func (d *Provider) EmbeddedClusterBinsSubDir() string {
-	hidden := fmt.Sprintf(".%s", d.BinaryName())
-	return filepath.Join(d.Base, d.config(), hidden, "bin")
+	return filepath.Join(d.Base, d.config(), d.BinaryName(), "bin")
 }
 
 // K0sctlApplyLogPath returns the path to the k0sctl apply log file.
@@ -173,11 +167,9 @@ func (d *Provider) SSHConfigSubDir() string {
 }
 
 // ConfigSubDir returns the path to the directory where k0sctl configuration
-// files are stored. This is a subdirectory of the user's home directory.
-// TODO update
+// files are stored.
 func (d *Provider) ConfigSubDir() string {
-	hidden := fmt.Sprintf(".%s", d.BinaryName())
-	return filepath.Join(d.Base, d.config(), hidden, "etc")
+	return filepath.Join(d.Base, d.config(), d.BinaryName(), "etc")
 }
 
 // K0sBinaryPath returns the path to the k0s binary.