fix: correct etc config dir

fix issue: #370 Signed-off-by: Deshi Xiao <[email protected]>
xiaods · Nov 22, 2024 · 462bda0 · 462bda0
1 parent 6875f88
commit 462bda0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go
@@ -378,7 +378,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
 	if envInfo.Rootless {
 		nodePasswordRoot = filepath.Join(envInfo.DataDir, "agent")
 	}
-	nodeConfigPath := filepath.Join(nodePasswordRoot, "etc", "rancher", "node")
+	nodeConfigPath := filepath.Join(nodePasswordRoot, "etc", "k8e", "node")
 	if err := os.MkdirAll(nodeConfigPath, 0755); err != nil {
 		return nil, err
 	}

diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go
@@ -140,7 +140,7 @@ var (
 		Name:        "private-registry",
 		Usage:       "(agent/runtime) Private registry configuration file",
 		Destination: &AgentConfig.PrivateRegistry,
-		Value:       "/etc/rancher/" + version.Program + "/registries.yaml",
+		Value:       "/etc/" + version.Program + "/registries.yaml",
 	}
 	AirgapExtraRegistryFlag = &cli.StringSliceFlag{
 		Name:   "airgap-extra-registry",

diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
@@ -110,7 +110,7 @@ var (
 	ServerConfig Server
 	DataDirFlag  = &cli.StringFlag{
 		Name:        "data-dir,d",
-		Usage:       "(data) Folder to hold state default /var/lib/" + version.Program + " or ${HOME}/.rancher/" + version.Program + " if not root",
+		Usage:       "(data) Folder to hold state default /var/lib/" + version.Program + " or ${HOME}/." + version.Program + " if not root",
 		Destination: &ServerConfig.DataDir,
 		EnvVar:      version.ProgramUpper + "_DATA_DIR",
 	}

diff --git a/pkg/rootless/mounts.go b/pkg/rootless/mounts.go
@@ -35,7 +35,7 @@ func setupMounts(stateDir string) error {
 		{"/var/log", filepath.Join(stateDir, "logs")},
 		{"/var/lib/cni", filepath.Join(stateDir, "cni")},
 		{"/var/lib/kubelet", filepath.Join(stateDir, "kubelet")},
-		{"/etc/rancher", filepath.Join(stateDir, "etc", "rancher")},
+		{"/etc/k8e", filepath.Join(stateDir, "etc", "k8e")},
 		{"/run/k8e/containerd", filepath.Join(runDir, "k8e", "containerd")},
 	}
 

diff --git a/pkg/server/router.go b/pkg/server/router.go
@@ -447,7 +447,7 @@ func verifyLocalPassword(ctx context.Context, config *Config, mu *sync.Mutex, de
 	if config.ControlConfig.Rootless {
 		nodePasswordRoot = filepath.Join(path.Dir(config.ControlConfig.DataDir), "agent")
 	}
-	nodeConfigPath := filepath.Join(nodePasswordRoot, "etc", "rancher", "node")
+	nodeConfigPath := filepath.Join(nodePasswordRoot, "etc", "k8e", "node")
 	nodePasswordFile := filepath.Join(nodeConfigPath, "password")
 
 	passBytes, err := os.ReadFile(nodePasswordFile)