Skip to content

Commit 5e75e9c

Browse files
committed
fix(deploy): service and some secret values wrongly propagated to subcharts
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent 5b078fb commit 5e75e9c

5 files changed

Lines changed: 6 additions & 14 deletions

File tree

cmd/werf/bundle/apply/apply.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ func runApply(ctx context.Context) error {
208208

209209
if err := bundles.Pull(ctx, fmt.Sprintf("%s:%s", repoAddress, cmdData.Tag), bundlePath, bundlesRegistryClient, helmopts.HelmOptions{
210210
ChartLoadOpts: helmopts.ChartLoadOptions{
211-
ChartDir: bundlePath,
212211
NoDecryptSecrets: *commonCmdData.IgnoreSecretKey,
213212
NoDefaultSecretValues: *commonCmdData.DisableDefaultSecretValues,
214213
NoDefaultValues: *commonCmdData.DisableDefaultValues,

cmd/werf/bundle/publish/publish.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ func runPublish(ctx context.Context, imageNameListFromArgs []string) error {
380380
opts := helmopts.HelmOptions{
381381
ChartLoadOpts: helmopts.ChartLoadOptions{
382382
ChartAppVersion: common.GetHelmChartConfigAppVersion(werfConfig),
383-
ChartDir: bundleTmpDir,
384383
DefaultChartAPIVersion: chart.APIVersionV2,
385384
DefaultChartName: werfConfig.Meta.Project,
386385
DefaultChartVersion: "1.0.0",
@@ -494,8 +493,6 @@ func createNewBundle(
494493
destDir = chrt.Metadata.Name
495494
}
496495

497-
opts.ChartLoadOpts.ChartDir = destDir
498-
499496
if err := os.RemoveAll(destDir); err != nil {
500497
return fmt.Errorf("unable to remove %q: %w", destDir, err)
501498
}

cmd/werf/bundle/render/render.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ func runRender(ctx context.Context) error {
208208

209209
if err := bundles.Pull(ctx, fmt.Sprintf("%s:%s", repoAddress, cmdData.Tag), bundlePath, bundlesRegistryClient, helmopts.HelmOptions{
210210
ChartLoadOpts: helmopts.ChartLoadOptions{
211-
ChartDir: bundlePath,
212211
NoDecryptSecrets: *commonCmdData.IgnoreSecretKey,
213212
NoDefaultSecretValues: *commonCmdData.DisableDefaultSecretValues,
214213
NoDefaultValues: *commonCmdData.DisableDefaultValues,

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/alessio/shellescape v1.4.2
1111
github.com/aws/aws-sdk-go-v2/config v1.26.6
1212
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2
13-
github.com/bmatcuk/doublestar v1.3.4
1413
github.com/cenkalti/backoff/v5 v5.0.1
1514
github.com/containerd/containerd v1.7.14
1615
github.com/containers/buildah v1.35.1
@@ -58,15 +57,15 @@ require (
5857
github.com/sirupsen/logrus v1.9.3
5958
github.com/spf13/cobra v1.8.0
6059
github.com/spf13/pflag v1.0.5
61-
github.com/werf/3p-helm v0.0.0-20250725100513-d2679f19b582
60+
github.com/werf/3p-helm v0.0.0-20250731134240-58a9eff8ec5b
6261
github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d
6362
github.com/werf/common-go v0.0.0-20250528135810-c90e95ac760d
6463
github.com/werf/copy-recurse v0.2.7
6564
github.com/werf/kubedog v0.13.1-0.20250728071655-b80f0b64e912
6665
github.com/werf/kubedog-for-werf-helm v0.0.0-20241217155728-9d45c48b82b6
6766
github.com/werf/lockgate v0.1.1
6867
github.com/werf/logboek v0.6.1
69-
github.com/werf/nelm v1.8.1-0.20250724160715-b842a90641a0
68+
github.com/werf/nelm v1.9.1-0.20250731134715-5824cfbe2c5e
7069
github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf
7170
go.opentelemetry.io/otel v1.24.0
7271
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw
225225
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
226226
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
227227
github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
228-
github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
229-
github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
230228
github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=
231229
github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
232230
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
@@ -1392,8 +1390,8 @@ github.com/werf/3p-buildah v1.35.2-0.20241120093816-5b80b7b735de h1:adTANOZyNmmn
13921390
github.com/werf/3p-buildah v1.35.2-0.20241120093816-5b80b7b735de/go.mod h1:vVSVUlTu8+99H5j43gBJscpkb/quZvdJg78+6X1HeTM=
13931391
github.com/werf/3p-docker-buildx v0.13.0-rc2.0.20241111114615-d77c2e1444ad h1:FBDNACfjjpDBwXhALF5LgvEiu08HpUurb/2G323SVsQ=
13941392
github.com/werf/3p-docker-buildx v0.13.0-rc2.0.20241111114615-d77c2e1444ad/go.mod h1:Q3gtkv8D3sdaa5LJXbzMooYR/A5vBiEB2yQ56wywohM=
1395-
github.com/werf/3p-helm v0.0.0-20250725100513-d2679f19b582 h1:TCYjjWpLxXYKJ8TlYg/KAqt7sHOh0BPJ9q4lb9xqtM8=
1396-
github.com/werf/3p-helm v0.0.0-20250725100513-d2679f19b582/go.mod h1:KDjmOsjFiOmj0fB0+q+0gGvlejPMjTgckLC59bX0BLg=
1393+
github.com/werf/3p-helm v0.0.0-20250731134240-58a9eff8ec5b h1:l9R9CvJLk8uaLmJpyuP5GboqzZaTqwxgfzuTMEbfF28=
1394+
github.com/werf/3p-helm v0.0.0-20250731134240-58a9eff8ec5b/go.mod h1:KDjmOsjFiOmj0fB0+q+0gGvlejPMjTgckLC59bX0BLg=
13971395
github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d h1:HN9jmAG2Gyhf8hJca9yoAO2xawNZQ/6OYDomxkKr5Sw=
13981396
github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d/go.mod h1:fozJ+C/Llp1e+jHxrJOZUu+D4QEw+laQK6W6RFqvTsg=
13991397
github.com/werf/3p-oras v0.9.1-0.20240115121544-03962ecbd40a h1:PsU9szHZlIH+CjcuIuPXRLc5dsdoaFldvYjS6YHI7YQ=
@@ -1410,8 +1408,8 @@ github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4=
14101408
github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE=
14111409
github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g=
14121410
github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
1413-
github.com/werf/nelm v1.8.1-0.20250724160715-b842a90641a0 h1:Gpe5DFxxtkDO6L3ucEH1zxSJNt3JYmeiDf/Xs9fP6mE=
1414-
github.com/werf/nelm v1.8.1-0.20250724160715-b842a90641a0/go.mod h1:P9YPTbxddM9fzVNGltUjnKOe1TuJegrWHnrK/hjBvTE=
1411+
github.com/werf/nelm v1.9.1-0.20250731134715-5824cfbe2c5e h1:S+t0V3tuNzCf5aAplEEDDUmIDgOakxCCr3w35gWBPeM=
1412+
github.com/werf/nelm v1.9.1-0.20250731134715-5824cfbe2c5e/go.mod h1:0Frc41vYWUNR+HBn0KwBWNIvp+PB/bMviZPOloZlSLc=
14151413
github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf h1:K51qz209c1yJgKzPw8AeS72T21F/ACp0VI3RJvT4THA=
14161414
github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf/go.mod h1:7RJXSGPKKPEvfPqrTwNA8jT7y52O0ebwhSbSn29ESMA=
14171415
github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=

0 commit comments

Comments
 (0)