chart_downloader: add TLS client config to options from repo config. (#7055)

Signed-off-by: Andreas Stenius <andreas.stenius@svenskaspel.se>
pull/7071/head
Andreas Stenius 5 years ago
parent e3f49085cc
commit d6c13616fa
No known key found for this signature in database
GPG Key ID: D2A6F15EE8C2A5CC

@ -214,6 +214,8 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
c.Options = append(c.Options, getter.WithBasicAuth(r.Config.Username, r.Config.Password)) c.Options = append(c.Options, getter.WithBasicAuth(r.Config.Username, r.Config.Password))
} }
c.Options = append(c.Options, getter.WithTLSClientConfig(r.Config.CertFile, r.Config.KeyFile, r.Config.CAFile))
// Next, we need to load the index, and actually look up the chart. // Next, we need to load the index, and actually look up the chart.
idxFile := filepath.Join(c.RepositoryCache, helmpath.CacheIndexFile(r.Config.Name)) idxFile := filepath.Join(c.RepositoryCache, helmpath.CacheIndexFile(r.Config.Name))
i, err := repo.LoadIndexFile(idxFile) i, err := repo.LoadIndexFile(idxFile)

@ -135,7 +135,7 @@ func TestResolveChartOpts(t *testing.T) {
continue continue
} }
if got != expect { if *(got.(*getter.HTTPGetter)) != *(expect.(*getter.HTTPGetter)) {
t.Errorf("%s: expected %s, got %s", tt.name, expect, got) t.Errorf("%s: expected %s, got %s", tt.name, expect, got)
} }
} }

Loading…
Cancel
Save