Skip to content

Commit 8e78762

Browse files
committed
fix(deploy): global encryption key (~/.werf/global_secret_key) ignored
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent 5bc910e commit 8e78762

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

cmd/werf/converge/converge.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,6 @@ func run(
402402
logColorMode = action.LogColorMode(*commonCmdData.LogColorMode)
403403
}
404404

405-
secrets_manager.WerfHomeDir = werf.GetHomeDir()
406-
407405
if err := action.Deploy(ctx, action.DeployOptions{
408406
ChartDirPath: chartPath,
409407
ChartRepositoryInsecure: *commonCmdData.InsecureHelmDependencies,

cmd/werf/plan/plan.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,6 @@ func run(
397397
return fmt.Errorf("get user extra labels: %w", err)
398398
}
399399

400-
secrets_manager.WerfHomeDir = werf.GetHomeDir()
401-
402400
if err := action.Plan(ctx, action.PlanOptions{
403401
ChartDirPath: chartPath,
404402
ChartRepositoryInsecure: *commonCmdData.InsecureHelmDependencies,

cmd/werf/render/render.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,6 @@ func runRender(ctx context.Context, imageNameListFromArgs []string) error {
355355
return fmt.Errorf("get user extra labels: %w", err)
356356
}
357357

358-
secrets_manager.WerfHomeDir = werf.GetHomeDir()
359-
360358
if err := action.Render(ctx, action.RenderOptions{
361359
ChartDirPath: chartPath,
362360
ChartRepositoryInsecure: *commonCmdData.InsecureHelmDependencies,

pkg/werf/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/werf/lockgate/pkg/file_lock"
1212
"github.com/werf/lockgate/pkg/file_locker"
1313
"github.com/werf/logboek"
14+
"github.com/werf/nelm/pkg/secrets_manager"
1415
)
1516

1617
var (
@@ -152,6 +153,7 @@ func Init(tmpDirOption, homeDirOption string) error {
152153
sharedContextDir = filepath.Join(homeDir, "shared_context")
153154
localCacheDir = filepath.Join(homeDir, "local_cache")
154155
serviceDir = filepath.Join(homeDir, "service")
156+
secrets_manager.WerfHomeDir = homeDir
155157

156158
file_lock.LegacyHashFunction = true
157159

0 commit comments

Comments
 (0)