Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/skaffold/deploy/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,10 @@ func (h *Deployer) deployRelease(ctx context.Context, out io.Writer, releaseName
if !r.SkipBuildDependencies && r.ChartPath != "" {
olog.Entry(ctx).Info("Building helm dependencies...")

if err := helm.Exec(ctx, h, out, false, nil, "dep", "build", r.ChartPath); err != nil {
args := []string{"dep", "build", r.ChartPath}
args = append(args, h.Flags.DepBuild...)

if err := helm.Exec(ctx, h, out, false, nil, args...); err != nil {
return nil, nil, helm.UserErr("building helm dependencies", err)
}
}
Expand Down
23 changes: 23 additions & 0 deletions pkg/skaffold/deploy/helm/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,16 @@ var testDeployChartWithUseHelmSecrets = latest.LegacyHelmDeploy{
}},
}

var testDeployWithDepBuild = latest.LegacyHelmDeploy{
Releases: []latest.HelmRelease{{
Name: "skaffold-helm",
ChartPath: "examples/test",
}},
Flags: latest.HelmDeployFlags{
DepBuild: []string{"--debug"},
},
}

var validDeployYaml = `
# Source: skaffold-helm/templates/deployment.yaml
apiVersion: apps/v1
Expand Down Expand Up @@ -1068,6 +1078,19 @@ func TestHelmDeploy(t *testing.T) {
builds: testBuilds,
expectedNamespaces: []string{"testReleaseNamespace"},
},
{
description: "helm3.2 dep build with debug",
commands: testutil.
CmdRunWithOutput("helm version --client", version32).
AndRun("helm --kube-context kubecontext get all skaffold-helm --kubeconfig kubeconfig").
AndRun("helm --kube-context kubecontext dep build examples/test --debug --kubeconfig kubeconfig").
AndRunEnv("helm --kube-context kubecontext upgrade skaffold-helm examples/test --post-renderer SKAFFOLD-BINARY --kubeconfig kubeconfig",
[]string{"SKAFFOLD_FILENAME=test.yaml", "SKAFFOLD_CMDLINE=filter --kube-context kubecontext --build-artifacts TMPFILE --kubeconfig kubeconfig"}).
AndRunWithOutput("helm --kube-context kubecontext get all skaffold-helm --template {{.Release.Manifest}} --kubeconfig kubeconfig", validDeployYaml),
helm: testDeployWithDepBuild,
builds: testBuilds,
expectedNamespaces: []string{""},
},
}

for _, test := range tests {
Expand Down
Loading