From 12a0b543f2245cbfdd55a6a75fb174711985cf43 Mon Sep 17 00:00:00 2001 From: Ilya Lesikov Date: Wed, 8 Jun 2022 11:53:11 +0300 Subject: [PATCH] fix(export-values): propagate result of export-values to all parent charts Values When we defined some Values in the subchart and also some of these Values defined in this chart's parents and we are passing some values via export-values to the same keys, then the merge result was wrong. Signed-off-by: Ilya Lesikov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3bb18d3d4f..a9e2d7d94f 100644 --- a/go.mod +++ b/go.mod @@ -307,6 +307,6 @@ replace k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f replace github.com/deislabs/oras => github.com/werf/third-party-oras v0.9.1-0.20210927171747-6d045506f4c8 -replace helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20220607095328-f3081d5407cf +replace helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20220608085145-0943d4045660 replace github.com/go-git/go-git/v5 => github.com/ZauberNerd/go-git/v5 v5.4.3-0.20220315170230-29ec1bc1e5db diff --git a/go.sum b/go.sum index d3028f7fe6..c76cdc15fb 100644 --- a/go.sum +++ b/go.sum @@ -2032,8 +2032,8 @@ github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59b github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU= github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= -github.com/werf/3p-helm/v3 v3.0.0-20220607095328-f3081d5407cf h1:fc5tXr3GvsGYQGdODC6jXvhx3CkHCeY7yPCpK45xJ48= -github.com/werf/3p-helm/v3 v3.0.0-20220607095328-f3081d5407cf/go.mod h1:NxtE2KObf2PrzDl6SIamPFPKyAqWi10iWuvKlQn/Yao= +github.com/werf/3p-helm/v3 v3.0.0-20220608085145-0943d4045660 h1:y38t8rviJW3+dk0n6QG7Jv1WbKZvCGJdBVjrOJaxEEk= +github.com/werf/3p-helm/v3 v3.0.0-20220608085145-0943d4045660/go.mod h1:NxtE2KObf2PrzDl6SIamPFPKyAqWi10iWuvKlQn/Yao= github.com/werf/copy-recurse v0.2.4 h1:kEyGUKhgS8WdEOjInNQKgk4lqPWzP2AgR27F3dcGsVc= github.com/werf/copy-recurse v0.2.4/go.mod h1:KVHSQ90p19xflWW0B7BJhLBwmSbEtuxIaBnjlUYRPhk= github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f h1:81YscYTF9mmTf0ULOsCmm42YWQp+qWDzWi1HjWniZrg=