fix(deploy): global encryption key (~/.werf/global_secret_key) ignored

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · Dec 3, 2024 · 8e78762 · 8e78762
1 parent 5bc910e
commit 8e78762
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/cmd/werf/converge/converge.go b/cmd/werf/converge/converge.go
@@ -402,8 +402,6 @@ func run(
 		logColorMode = action.LogColorMode(*commonCmdData.LogColorMode)
 	}
 
-	secrets_manager.WerfHomeDir = werf.GetHomeDir()
-
 	if err := action.Deploy(ctx, action.DeployOptions{
 		ChartDirPath:               chartPath,
 		ChartRepositoryInsecure:    *commonCmdData.InsecureHelmDependencies,

diff --git a/cmd/werf/plan/plan.go b/cmd/werf/plan/plan.go
@@ -397,8 +397,6 @@ func run(
 		return fmt.Errorf("get user extra labels: %w", err)
 	}
 
-	secrets_manager.WerfHomeDir = werf.GetHomeDir()
-
 	if err := action.Plan(ctx, action.PlanOptions{
 		ChartDirPath:               chartPath,
 		ChartRepositoryInsecure:    *commonCmdData.InsecureHelmDependencies,

diff --git a/cmd/werf/render/render.go b/cmd/werf/render/render.go
@@ -355,8 +355,6 @@ func runRender(ctx context.Context, imageNameListFromArgs []string) error {
 		return fmt.Errorf("get user extra labels: %w", err)
 	}
 
-	secrets_manager.WerfHomeDir = werf.GetHomeDir()
-
 	if err := action.Render(ctx, action.RenderOptions{
 		ChartDirPath:               chartPath,
 		ChartRepositoryInsecure:    *commonCmdData.InsecureHelmDependencies,

diff --git a/pkg/werf/main.go b/pkg/werf/main.go
@@ -11,6 +11,7 @@ import (
 	"github.com/werf/lockgate/pkg/file_lock"
 	"github.com/werf/lockgate/pkg/file_locker"
 	"github.com/werf/logboek"
+	"github.com/werf/nelm/pkg/secrets_manager"
 )
 
 var (
@@ -152,6 +153,7 @@ func Init(tmpDirOption, homeDirOption string) error {
 	sharedContextDir = filepath.Join(homeDir, "shared_context")
 	localCacheDir = filepath.Join(homeDir, "local_cache")
 	serviceDir = filepath.Join(homeDir, "service")
+	secrets_manager.WerfHomeDir = homeDir
 
 	file_lock.LegacyHashFunction = true