Fix work dir nested yurthub/yurthub

openyurtio · Sep 6, 2023 · 02bc52f · 02bc52f
1 parent 2ed7f0f
commit 02bc52f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/yurthub/certificate/manager/manager.go b/pkg/yurthub/certificate/manager/manager.go
@@ -46,7 +46,7 @@ var (
 	apiServerClientCertNotReadyError = errors.New("APIServer client certificate")
 	caCertIsNotReadyError            = errors.New("ca.crt file")
 
-	DefaultRootDir = "/var/lib"
+	DefaultWorkDir = filepath.Join("/var/lib", projectinfo.GetHubName())
 )
 
 type yurtHubCertManager struct {
@@ -58,10 +58,12 @@ type yurtHubCertManager struct {
 func NewYurtHubCertManager(options *options.YurtHubOptions, remoteServers []*url.URL) (hubCert.YurtCertificateManager, error) {
 	var clientCertManager hubCert.YurtClientCertificateManager
 	var err error
+	var workDir string
 
-	workDir := filepath.Join(options.RootDir, projectinfo.GetHubName())
 	if len(options.RootDir) == 0 {
-		workDir = filepath.Join(DefaultRootDir, projectinfo.GetHubName())
+		workDir = DefaultWorkDir
+	} else {
+		workDir = options.RootDir
 	}
 
 	if options.BootstrapMode == "kubeletcertificate" {