From 6de29f9a61a38de172c4d527560c904ef81e263c Mon Sep 17 00:00:00 2001 From: Tim Park Date: Mon, 2 Nov 2020 14:20:51 -0800 Subject: [PATCH 1/2] Update stable repo to https://charts.helm.sh/stable --- cmd/install.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/install.go b/cmd/install.go index ff8f804..46d551f 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -28,7 +28,7 @@ func Install(path string) (err error) { // to exist in Fabrikate as a non-http repo. // See timeline/deprecation schedule: https://github.com/helm/charts logger.Info(emoji.Sprintf(":point_right: Adding stable repository")) - if output, err := exec.Command("helm", "repo", "add", "stable", "https://kubernetes-charts.storage.googleapis.com").CombinedOutput(); err != nil { + if output, err := exec.Command("helm", "repo", "add", "stable", "https://charts.helm.sh/stable").CombinedOutput(); err != nil { logger.Error(emoji.Sprintf(":no_entry_sign: %s: %s", err, output)) return err } @@ -85,7 +85,7 @@ func Install(path string) (err error) { var installCmd = &cobra.Command{ Use: "install", Short: "Installs all of the remote components specified in the current deployment tree locally", - Long: `Installs all of the remote components specified in the current deployment tree locally, iterating the + Long: `Installs all of the remote components specified in the current deployment tree locally, iterating the component subtree from the current directory to do so. Required to be executed before generate (if needed), such that Fabrikate has all of the dependencies locally to use to generate the resource manifests.`, RunE: func(cmd *cobra.Command, args []string) (err error) { From ee72896193b2767de370b705065963ea04becad3 Mon Sep 17 00:00:00 2001 From: Tim Park Date: Mon, 2 Nov 2020 14:36:45 -0800 Subject: [PATCH 2/2] Remove adding stable repo by default --- cmd/install.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cmd/install.go b/cmd/install.go index 46d551f..19f8f29 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -24,15 +24,6 @@ func Install(path string) (err error) { logger.Info(emoji.Sprintf(":mag: Using %s: %s", tool, path)) } - // By default, Helm 2 used to have the "stable" repo. This is assumed - // to exist in Fabrikate as a non-http repo. - // See timeline/deprecation schedule: https://github.com/helm/charts - logger.Info(emoji.Sprintf(":point_right: Adding stable repository")) - if output, err := exec.Command("helm", "repo", "add", "stable", "https://charts.helm.sh/stable").CombinedOutput(); err != nil { - logger.Error(emoji.Sprintf(":no_entry_sign: %s: %s", err, output)) - return err - } - rootInit := func(startingPath string, environments []string, c core.Component) (component core.Component, err error) { return c.InstallRoot(startingPath, environments) }