Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(helm): properly initialize all slice structs
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Aug 4, 2022
1 parent 7d19f54 commit 07b1e42
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -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
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/helm/external_deps_annotations_parser.go
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/helm/stages_splitter.go
Expand Up @@ -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 {
Expand Down

0 comments on commit 07b1e42

Please sign in to comment.