Make chart cache path configuration available to downloaders

Signed-off-by: Reinaldo de Souza Jr <github@rei.nal.do>

cmd/helm/dependency_build.go

@@ -61,6 +61,7 @@ func newDependencyBuildCmd(out io.Writer) *cobra.Command {
 				Getters:          getter.All(settings),
 				RepositoryConfig: settings.RepositoryConfig,
 				RepositoryCache:  settings.RepositoryCache,
+				ChartCache:       settings.ChartCache,
 				Debug:            settings.Debug,
 			}
 			if client.Verify {

cmd/helm/dependency_update.go

@@ -65,6 +65,7 @@ func newDependencyUpdateCmd(out io.Writer) *cobra.Command {
 				Getters:          getter.All(settings),
 				RepositoryConfig: settings.RepositoryConfig,
 				RepositoryCache:  settings.RepositoryCache,
+				ChartCache:       settings.ChartCache,
 				Debug:            settings.Debug,
 			}
 			if client.Verify {

cmd/helm/install.go

@@ -222,6 +222,7 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 					Getters:          p,
 					RepositoryConfig: settings.RepositoryConfig,
 					RepositoryCache:  settings.RepositoryCache,
+					ChartCache:       settings.ChartCache,
 					Debug:            settings.Debug,
 				}
 				if err := man.Update(); err != nil {

cmd/helm/package.go

@@ -94,6 +94,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 						Debug:            settings.Debug,
 						RepositoryConfig: settings.RepositoryConfig,
 						RepositoryCache:  settings.RepositoryCache,
+						ChartCache:       settings.ChartCache,
 					}
 
 					if err := downloadManager.Update(); err != nil {

pkg/action/install.go

@@ -649,6 +649,7 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
 		},
 		RepositoryConfig: settings.RepositoryConfig,
 		RepositoryCache:  settings.RepositoryCache,
+		ChartCache:       settings.ChartCache,
 	}
 	if c.Verify {
 		dl.Verify = downloader.VerifyAlways

pkg/action/pull.go

@@ -68,6 +68,7 @@ func (p *Pull) Run(chartRef string) (string, error) {
 		},
 		RepositoryConfig: p.Settings.RepositoryConfig,
 		RepositoryCache:  p.Settings.RepositoryCache,
+		ChartCache:       p.Settings.ChartCache,
 	}
 
 	if p.Verify {

pkg/downloader/chart_downloader.go

@@ -70,6 +70,7 @@ type ChartDownloader struct {
 	Options          []getter.Option
 	RepositoryConfig string
 	RepositoryCache  string
+	ChartCache       string
 }
 
 // DownloadTo retrieves a chart. Depending on the settings, it may also download a provenance file.

pkg/downloader/chart_downloader_test.go

@@ -31,6 +31,7 @@ import (
 const (
 	repoConfig = "testdata/repositories.yaml"
 	repoCache  = "testdata/repository"
+	chartCache = "testdata/charts"
 )
 
 func TestResolveChartRef(t *testing.T) {
@@ -199,6 +200,7 @@ func TestDownloadTo(t *testing.T) {
 		Keyring:          "testdata/helm-test-key.pub",
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ChartCache:       chartCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,
@@ -252,6 +254,7 @@ func TestDownloadTo_TLS(t *testing.T) {
 		Keyring:          "testdata/helm-test-key.pub",
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ChartCache:       chartCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,
@@ -299,6 +302,7 @@ func TestDownloadTo_VerifyLater(t *testing.T) {
 		Verify:           VerifyLater,
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ChartCache:       chartCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,
@@ -328,6 +332,7 @@ func TestScanReposForURL(t *testing.T) {
 		Verify:           VerifyLater,
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ChartCache:       chartCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,

pkg/downloader/manager.go

@@ -73,6 +73,7 @@ type Manager struct {
 	Getters          []getter.Provider
 	RepositoryConfig string
 	RepositoryCache  string
+	ChartCache       string
 }
 
 // Build rebuilds a local charts directory from a lockfile.
@@ -326,6 +327,7 @@ func (m *Manager) downloadAll(deps []*chart.Dependency) error {
 			Keyring:          m.Keyring,
 			RepositoryConfig: m.RepositoryConfig,
 			RepositoryCache:  m.RepositoryCache,
+			ChartCache:       m.ChartCache,
 			Getters:          m.Getters,
 			Options: []getter.Option{
 				getter.WithBasicAuth(username, password),

pkg/downloader/manager_test.go

@@ -71,6 +71,7 @@ func TestFindChartURL(t *testing.T) {
 		Out:              &b,
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ChartCache:       chartCache,
 	}
 	repos, err := m.loadChartRepositories()
 	if err != nil {
@@ -102,6 +103,7 @@ func TestGetRepoNames(t *testing.T) {
 		Out:              b,
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ChartCache:       chartCache,
 	}
 	tests := []struct {
 		name   string
@@ -235,6 +237,7 @@ func TestUpdateBeforeBuild(t *testing.T) {
 		Getters:          g,
 		RepositoryConfig: dir("repositories.yaml"),
 		RepositoryCache:  dir(),
+		ChartCache:       dir(),
 	}
 
 	// Update before Build. see issue: https://github.com/helm/helm/issues/7101
@@ -305,6 +308,7 @@ func checkBuildWithOptionalFields(t *testing.T, chartName string, dep chart.Depe
 		Getters:          g,
 		RepositoryConfig: dir("repositories.yaml"),
 		RepositoryCache:  dir(),
+		ChartCache:       dir(),
 	}
 
 	// First build will update dependencies and create Chart.lock file.