Skip to content

Commit

Permalink
fix(helm): use secrets helm plugin to render when useHelmSecrets is t…
Browse files Browse the repository at this point in the history
…rue (#9295)
  • Loading branch information
idsulik committed Feb 6, 2024
1 parent 983a622 commit 7e79f94
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
19 changes: 19 additions & 0 deletions pkg/skaffold/deploy/helm/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,18 @@ var testDeployNoOverridesConfig = latest.LegacyHelmDeploy{
}},
}

var testDeployChartWithUseHelmSecrets = latest.LegacyHelmDeploy{
Releases: []latest.HelmRelease{{
Name: "skaffold-helm",
ChartPath: "examples/test",
SetValues: map[string]string{
"some.key": "somevalue",
},
UseHelmSecrets: true,
SkipBuildDependencies: true,
}},
}

var validDeployYaml = `
# Source: skaffold-helm/templates/deployment.yaml
apiVersion: apps/v1
Expand Down Expand Up @@ -1340,6 +1352,13 @@ func TestHelmRender(t *testing.T) {
Tag: "skaffold-helm:tag1",
}},
},
{
description: "render with useHelmSecrets",
shouldErr: false,
commands: testutil.
CmdRun("helm secrets --kube-context kubecontext template skaffold-helm examples/test --set some.key=somevalue --kubeconfig kubeconfig"),
helm: testDeployChartWithUseHelmSecrets,
},
}
labeller := label.DefaultLabeller{}
labels := labeller.Labels()
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/render/renderer/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
}
}

err = helm.ExecWithStdoutAndStderr(ctx, h, outBuffer, errBuffer, false, env, args...)
err = helm.ExecWithStdoutAndStderr(ctx, h, outBuffer, errBuffer, release.UseHelmSecrets, env, args...)
errorMsg := errBuffer.String()

if len(errorMsg) > 0 {
Expand Down

0 comments on commit 7e79f94

Please sign in to comment.