From 88ac8f282908a89b8788ac390b220408682b44e9 Mon Sep 17 00:00:00 2001 From: deanesmith Date: Thu, 19 Dec 2019 09:23:43 -0500 Subject: [PATCH] feat: Bump helm version using version stream --- pkg/cmd/opts/install.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/opts/install.go b/pkg/cmd/opts/install.go index d07c50aceb..0ac3ef6f86 100644 --- a/pkg/cmd/opts/install.go +++ b/pkg/cmd/opts/install.go @@ -328,7 +328,7 @@ func (o *CommonOptions) InstallHelm() error { binary := "helm" if runtime.GOOS == "darwin" && !o.NoBrew { - err := o.RunCommand("brew", "install", "kubernetes-helm") + err := o.RunCommand("brew", "install", "helm@2") if err != nil { return err } @@ -344,11 +344,18 @@ func (o *CommonOptions) InstallHelm() error { if err != nil || !flag { return err } - latestVersion, err := util.GetLatestVersionFromGitHub("kubernetes", "helm") + + versionResolver, err := o.GetVersionResolver() if err != nil { return err } - clientURL := fmt.Sprintf("https://storage.googleapis.com/kubernetes-helm/helm-v%s-%s-%s.tar.gz", latestVersion, runtime.GOOS, runtime.GOARCH) + + stableVersion, err := versionResolver.StableVersionNumber(versionstream.KindPackage, "helm") + if err != nil { + return err + } + + clientURL := fmt.Sprintf("https://storage.googleapis.com/kubernetes-helm/helm-v%s-%s-%s.tar.gz", stableVersion, runtime.GOOS, runtime.GOARCH) fullPath := filepath.Join(binDir, fileName) tarFile := fullPath + ".tgz" err = packages.DownloadFile(clientURL, tarFile)