Merge pull request #5291 from xichengliudui/updatefunc

Fix function comment to consistent with its name
pull/5294/head
Michelle Noorali 7 years ago committed by GitHub
commit 9cfb92185c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -40,7 +40,7 @@ var (
// Capabilities describes the capabilities of the Kubernetes cluster that Tiller is attached to. // Capabilities describes the capabilities of the Kubernetes cluster that Tiller is attached to.
type Capabilities struct { type Capabilities struct {
// List of all supported API versions // APIVersions list of all supported API versions
APIVersions VersionSet APIVersions VersionSet
// KubeVersion is the Kubernetes version // KubeVersion is the Kubernetes version
KubeVersion *version.Info KubeVersion *version.Info

@ -85,7 +85,7 @@ type Requirements struct {
// //
// It represents the state that the dependencies should be in. // It represents the state that the dependencies should be in.
type RequirementsLock struct { type RequirementsLock struct {
// Genderated is the date the lock file was last generated. // Generated is the date the lock file was last generated.
Generated time.Time `json:"generated"` Generated time.Time `json:"generated"`
// Digest is a hash of the requirements file used to generate it. // Digest is a hash of the requirements file used to generate it.
Digest string `json:"digest"` Digest string `json:"digest"`

@ -65,11 +65,11 @@ type ChartDownloader struct {
Keyring string Keyring string
// HelmHome is the $HELM_HOME. // HelmHome is the $HELM_HOME.
HelmHome helmpath.Home HelmHome helmpath.Home
// Getter collection for the operation // Getters collection for the operation
Getters getter.Providers Getters getter.Providers
// Chart repository username // Username chart repository username
Username string Username string
// Chart repository password // Password chart repository password
Password string Password string
} }
@ -243,14 +243,14 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, ge
return u, r.Client, nil return u, r.Client, nil
} }
// If HttpGetter is used, this method sets the configured repository credentials on the HttpGetter. // setCredentials if HttpGetter is used, this method sets the configured repository credentials on the HttpGetter.
func (c *ChartDownloader) setCredentials(r *repo.ChartRepository) { func (c *ChartDownloader) setCredentials(r *repo.ChartRepository) {
if t, ok := r.Client.(*getter.HttpGetter); ok { if t, ok := r.Client.(*getter.HttpGetter); ok {
t.SetCredentials(c.getRepoCredentials(r)) t.SetCredentials(c.getRepoCredentials(r))
} }
} }
// If this ChartDownloader is not configured to use credentials, and the chart repository sent as an argument is, // getRepoCredentials if this ChartDownloader is not configured to use credentials, and the chart repository sent as an argument is,
// then the repository's configured credentials are returned. // then the repository's configured credentials are returned.
// Else, this ChartDownloader's credentials are returned. // Else, this ChartDownloader's credentials are returned.
func (c *ChartDownloader) getRepoCredentials(r *repo.ChartRepository) (username, password string) { func (c *ChartDownloader) getRepoCredentials(r *repo.ChartRepository) (username, password string) {

Loading…
Cancel
Save