diff --git a/go.mod b/go.mod index 0791b079a9..9a2d002b06 100644 --- a/go.mod +++ b/go.mod @@ -313,6 +313,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-20220729131132-419066a89568 +replace helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20220804095655-eeca688dd6c7 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 bb3254ff41..bc0703a223 100644 --- a/go.sum +++ b/go.sum @@ -2048,8 +2048,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-20220729131132-419066a89568 h1:upzf5/Scxml9mZbt409RTcXkrkWYscWCJQB9IkE9pIU= -github.com/werf/3p-helm/v3 v3.0.0-20220729131132-419066a89568/go.mod h1:NxtE2KObf2PrzDl6SIamPFPKyAqWi10iWuvKlQn/Yao= +github.com/werf/3p-helm/v3 v3.0.0-20220804095655-eeca688dd6c7 h1:cmF8XImvH3IWjfDRT9jc2bqTbWIeRqc9x5YMgZK5lFg= +github.com/werf/3p-helm/v3 v3.0.0-20220804095655-eeca688dd6c7/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= diff --git a/pkg/deploy/helm/external_deps_annotations_parser.go b/pkg/deploy/helm/external_deps_annotations_parser.go index fd3126a897..b409347a2e 100644 --- a/pkg/deploy/helm/external_deps_annotations_parser.go +++ b/pkg/deploy/helm/external_deps_annotations_parser.go @@ -34,7 +34,7 @@ func (s *ExternalDepsAnnotationsParser) Parse(annotations map[string]string) (ex } func (s *ExternalDepsAnnotationsParser) parseResourceAnnotations(annotations map[string]string) (externaldeps.ExternalDependencyList, error) { - var externalDependencyList externaldeps.ExternalDependencyList + externalDependencyList := externaldeps.ExternalDependencyList{} for annoKey, annoVal := range annotations { annoKey, annoVal = s.normalizeAnnotation(annoKey, annoVal) diff --git a/pkg/deploy/helm/stages_splitter.go b/pkg/deploy/helm/stages_splitter.go index 517c07619d..8ae634e707 100644 --- a/pkg/deploy/helm/stages_splitter.go +++ b/pkg/deploy/helm/stages_splitter.go @@ -17,7 +17,7 @@ func NewStagesSplitter() *StagesSplitter { type StagesSplitter struct{} func (s *StagesSplitter) Split(resources kube.ResourceList) (stages.SortedStageList, error) { - var stageList stages.SortedStageList + stageList := stages.SortedStageList{} if err := resources.Visit(func(resInfo *resource.Info, err error) error { if err != nil {