From e2965004670aefb051b6f504383a8d013b213a81 Mon Sep 17 00:00:00 2001 From: gsquared94 Date: Tue, 13 Apr 2021 19:34:41 -0700 Subject: [PATCH 1/2] helm `render` needs to handle `repo` parameter --- pkg/skaffold/deploy/helm/deploy.go | 5 +++++ pkg/skaffold/deploy/helm/helm_test.go | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/pkg/skaffold/deploy/helm/deploy.go b/pkg/skaffold/deploy/helm/deploy.go index 76328a13a9b..67b2822724c 100644 --- a/pkg/skaffold/deploy/helm/deploy.go +++ b/pkg/skaffold/deploy/helm/deploy.go @@ -288,6 +288,11 @@ func (h *Deployer) Render(ctx context.Context, out io.Writer, builds []graph.Art args = append(args, "--namespace", namespace) } + if r.Repo != "" { + args = append(args, "--repo") + args = append(args, r.Repo) + } + outBuffer := new(bytes.Buffer) if err := h.exec(ctx, outBuffer, false, nil, args...); err != nil { return userErr("std out err", fmt.Errorf(outBuffer.String())) diff --git a/pkg/skaffold/deploy/helm/helm_test.go b/pkg/skaffold/deploy/helm/helm_test.go index 18055e8a8cc..86d91fa07ed 100644 --- a/pkg/skaffold/deploy/helm/helm_test.go +++ b/pkg/skaffold/deploy/helm/helm_test.go @@ -1349,6 +1349,18 @@ func TestHelmRender(t *testing.T) { Tag: "skaffold-helm:tag1", }}, }, + { + description: "render with remote repo", + shouldErr: false, + commands: testutil.CmdRunWithOutput("helm version --client", version31). + AndRun("helm --kube-context kubecontext template skaffold-helm examples/test --set-string image=skaffold-helm:tag1 --set some.key=somevalue --repo https://charts.helm.sh/stable --kubeconfig kubeconfig"), + helm: testDeployConfigRemoteRepo, + builds: []graph.Artifact{ + { + ImageName: "skaffold-helm", + Tag: "skaffold-helm:tag1", + }}, + }, { description: "render with cli namespace", shouldErr: false, From b9e78537fba8a0a6d628789e346bc197172248c3 Mon Sep 17 00:00:00 2001 From: gsquared94 Date: Wed, 14 Apr 2021 10:01:04 -0700 Subject: [PATCH 2/2] appease linters --- pkg/skaffold/deploy/helm/deploy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/skaffold/deploy/helm/deploy.go b/pkg/skaffold/deploy/helm/deploy.go index 67b2822724c..186586ba827 100644 --- a/pkg/skaffold/deploy/helm/deploy.go +++ b/pkg/skaffold/deploy/helm/deploy.go @@ -292,7 +292,7 @@ func (h *Deployer) Render(ctx context.Context, out io.Writer, builds []graph.Art args = append(args, "--repo") args = append(args, r.Repo) } - + outBuffer := new(bytes.Buffer) if err := h.exec(ctx, outBuffer, false, nil, args...); err != nil { return userErr("std out err", fmt.Errorf(outBuffer.String()))