Skip to content

Commit

Permalink
fix(deploy): panics with subcharts
Browse files Browse the repository at this point in the history
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Dec 23, 2024
1 parent 7439fa1 commit 15c1981
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/werf/3p-helm v0.0.0-20241223155809-0f6e85aa2a1b
github.com/werf/3p-helm v0.0.0-20241223173040-d6097f300ac3
github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d
github.com/werf/common-go v0.0.0-20241223155739-795e5e1541aa
github.com/werf/copy-recurse v0.2.7
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1425,8 +1425,8 @@ github.com/werf/3p-buildah v1.35.2-0.20241120093816-5b80b7b735de h1:adTANOZyNmmn
github.com/werf/3p-buildah v1.35.2-0.20241120093816-5b80b7b735de/go.mod h1:vVSVUlTu8+99H5j43gBJscpkb/quZvdJg78+6X1HeTM=
github.com/werf/3p-docker-buildx v0.13.0-rc2.0.20241111114615-d77c2e1444ad h1:FBDNACfjjpDBwXhALF5LgvEiu08HpUurb/2G323SVsQ=
github.com/werf/3p-docker-buildx v0.13.0-rc2.0.20241111114615-d77c2e1444ad/go.mod h1:Q3gtkv8D3sdaa5LJXbzMooYR/A5vBiEB2yQ56wywohM=
github.com/werf/3p-helm v0.0.0-20241223155809-0f6e85aa2a1b h1:Ixe/q5+TTGA6UeBRgEayjgloFQfH4BhNuivb3F+n04g=
github.com/werf/3p-helm v0.0.0-20241223155809-0f6e85aa2a1b/go.mod h1:r+Wn8MWlcwkI+A+HrVHHMimFCarNpOmXc7thqjcF03I=
github.com/werf/3p-helm v0.0.0-20241223173040-d6097f300ac3 h1:RliiQ23Ktieh+1+4YHsmLA+VQSWOKB87clkgPOQmkxI=
github.com/werf/3p-helm v0.0.0-20241223173040-d6097f300ac3/go.mod h1:r+Wn8MWlcwkI+A+HrVHHMimFCarNpOmXc7thqjcF03I=
github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d h1:HN9jmAG2Gyhf8hJca9yoAO2xawNZQ/6OYDomxkKr5Sw=
github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d/go.mod h1:fozJ+C/Llp1e+jHxrJOZUu+D4QEw+laQK6W6RFqvTsg=
github.com/werf/3p-oras v0.9.1-0.20240115121544-03962ecbd40a h1:PsU9szHZlIH+CjcuIuPXRLc5dsdoaFldvYjS6YHI7YQ=
Expand Down
5 changes: 5 additions & 0 deletions pkg/deploy/helm/chart_extender/chart_dependencies_loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
"github.com/werf/3p-helm/pkg/provenance"
"github.com/werf/3p-helm/pkg/registry"
"github.com/werf/3p-helm/pkg/werf/file"
"github.com/werf/3p-helm/pkg/werf/secrets"
"github.com/werf/3p-helm/pkg/werf/secrets/runtimedata"
"github.com/werf/common-go/pkg/util"
"github.com/werf/lockgate"
"github.com/werf/logboek"
Expand Down Expand Up @@ -182,6 +184,9 @@ func GetPreparedChartDependenciesDir(ctx context.Context, metadataFile, metadata
buildChartDependenciesOpts.LoadOptions = &loader.LoadOptions{
ChartExtender: NewWerfChartStub(ctx, buildChartDependenciesOpts.IgnoreInvalidAnnotationsAndLabels),
SubchartExtenderFactoryFunc: nil,
SecretsRuntimeDataFactoryFunc: func() runtimedata.RuntimeData {
return secrets.NewSecretsRuntimeData()
},
}
if err := command_helpers.BuildChartDependenciesInDir(ctx, tmpDepsDir, helmEnvSettings, registryClient, buildChartDependenciesOpts); err != nil {
return fmt.Errorf("error building chart dependencies: %w", err)
Expand Down

0 comments on commit 15c1981

Please sign in to comment.