From af2faef241e739a82d1d66b5929122f22727b493 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Tue, 23 Oct 2018 01:26:10 +0100 Subject: [PATCH] Fix using Bazel built helm during e2e tests Signed-off-by: James Munnelly --- test/e2e/framework/addon/chart/addon.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/addon/chart/addon.go b/test/e2e/framework/addon/chart/addon.go index 16a2e5575..6e9af7e8e 100644 --- a/test/e2e/framework/addon/chart/addon.go +++ b/test/e2e/framework/addon/chart/addon.go @@ -84,6 +84,10 @@ type Details struct { func (c *Chart) Setup(cfg *config.Config) error { var err error + c.config = cfg + if c.config.Addons.Helm.Path == "" { + return fmt.Errorf("--helm-binary-path must be set") + } if c.Tiller == nil { return fmt.Errorf("tiller base addon must be provided") } @@ -168,7 +172,7 @@ func (c *Chart) buildHelmCmd(args ...string) *exec.Cmd { "--kube-context", c.tillerDetails.KubeContext, "--tiller-namespace", c.tillerDetails.Namespace, }, args...) - cmd := exec.Command("helm", args...) + cmd := exec.Command(c.config.Addons.Helm.Path, args...) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr return cmd