Fix User-Agent header in requests made by Helm

Signed-off-by: Jakub Warczarek <jakub.warczarek@gmail.com>
pull/10207/head
Jakub Warczarek 4 years ago committed by Jakub Warczarek
parent f08db5c899
commit 7ca486f6fe

@ -32,6 +32,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"helm.sh/helm/v3/internal/version"
"helm.sh/helm/v3/pkg/helmpath" "helm.sh/helm/v3/pkg/helmpath"
) )
@ -226,5 +227,9 @@ func (s *EnvSettings) SetNamespace(namespace string) {
// RESTClientGetter gets the kubeconfig from EnvSettings // RESTClientGetter gets the kubeconfig from EnvSettings
func (s *EnvSettings) RESTClientGetter() genericclioptions.RESTClientGetter { func (s *EnvSettings) RESTClientGetter() genericclioptions.RESTClientGetter {
s.config.WrapConfigFn = func(c *rest.Config) *rest.Config {
c.UserAgent = version.GetUserAgent()
return c
}
return s.config return s.config
} }

@ -310,14 +310,13 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
repoURL.Path = strings.TrimSuffix(repoURL.Path, "/") + "/" repoURL.Path = strings.TrimSuffix(repoURL.Path, "/") + "/"
u = repoURL.ResolveReference(u) u = repoURL.ResolveReference(u)
u.RawQuery = q.Encode() u.RawQuery = q.Encode()
// TODO add user-agent
if _, err := getter.NewHTTPGetter(getter.WithURL(rc.URL)); err != nil { if _, err := getter.NewHTTPGetter(getter.WithURL(rc.URL)); err != nil {
return repoURL, err return repoURL, err
} }
return u, err return u, err
} }
// TODO add user-agent
return u, nil return u, nil
} }

@ -124,7 +124,6 @@ func (r *ChartRepository) DownloadIndexFile() (string, error) {
parsedURL.Path = path.Join(parsedURL.Path, "index.yaml") parsedURL.Path = path.Join(parsedURL.Path, "index.yaml")
indexURL := parsedURL.String() indexURL := parsedURL.String()
// TODO add user-agent
resp, err := r.Client.Get(indexURL, resp, err := r.Client.Get(indexURL,
getter.WithURL(r.Config.URL), getter.WithURL(r.Config.URL),
getter.WithInsecureSkipVerifyTLS(r.Config.InsecureSkipTLSverify), getter.WithInsecureSkipVerifyTLS(r.Config.InsecureSkipTLSverify),

Loading…
Cancel
Save