From a4610e3e8c930b49ef215a3ca073e3074bd74e8b Mon Sep 17 00:00:00 2001 From: Timofey Kirillov Date: Thu, 5 May 2022 20:32:01 +0300 Subject: [PATCH] fix(helm): solved broken 3 way merge case when pre-upgrade hook fails Refs https://github.com/werf/3p-helm/pull/168 Refs https://github.com/werf/werf/issues/4155 Signed-off-by: Timofey Kirillov --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c7750f00a3..dc6f601471 100644 --- a/go.mod +++ b/go.mod @@ -109,4 +109,4 @@ 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-20220505124452-ccb543496feb +replace helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20220505172810-cd89189d526c diff --git a/go.sum b/go.sum index dfa13d85b3..97cfe07f22 100644 --- a/go.sum +++ b/go.sum @@ -2069,6 +2069,8 @@ github.com/werf/3p-helm/v3 v3.0.0-20220428190238-94f85ca83011 h1:/5kpc5aE+ih8HTn github.com/werf/3p-helm/v3 v3.0.0-20220428190238-94f85ca83011/go.mod h1:Nm0Z2ciZFFvR9cRKpiRE2SMhJTgqY0b+ezT2cDcyqNw= github.com/werf/3p-helm/v3 v3.0.0-20220505124452-ccb543496feb h1:PqeCBXwmQ7YDRmVrIkHQfVt51EVmO5MXN1XbPiOF/oE= github.com/werf/3p-helm/v3 v3.0.0-20220505124452-ccb543496feb/go.mod h1:NxtE2KObf2PrzDl6SIamPFPKyAqWi10iWuvKlQn/Yao= +github.com/werf/3p-helm/v3 v3.0.0-20220505172810-cd89189d526c h1:7sxe84Bne3NiHv6TbFiF+miCsDjSzCuCD16LSCY9X/A= +github.com/werf/3p-helm/v3 v3.0.0-20220505172810-cd89189d526c/go.mod h1:NxtE2KObf2PrzDl6SIamPFPKyAqWi10iWuvKlQn/Yao= github.com/werf/copy-recurse v0.2.2 h1:OpBB+Ezsv7j+iQR02p7zUQXSefZ7UaKBtQPMg2dxi7M= github.com/werf/copy-recurse v0.2.2/go.mod h1:KVHSQ90p19xflWW0B7BJhLBwmSbEtuxIaBnjlUYRPhk= github.com/werf/copy-recurse v0.2.3 h1:bi43vHBDQiX2Qnq+Ci9IGqtm7YdzzpkBO+8MKjp6x8g=