From 93f7e8d2e2d7dced5b183b3abfbf34b1dc722045 Mon Sep 17 00:00:00 2001 From: yuxiaobo Date: Wed, 18 Sep 2019 14:44:05 +0800 Subject: [PATCH] Grammatical correction Signed-off-by: yuxiaobo --- pkg/downloader/manager.go | 2 +- pkg/kube/client.go | 2 +- pkg/plugin/installer/http_installer.go | 2 +- pkg/plugin/installer/installer.go | 4 ++-- pkg/plugin/installer/local_installer.go | 2 +- pkg/plugin/installer/vcs_installer.go | 2 +- pkg/storage/driver/cfgmaps.go | 4 ++-- pkg/storage/driver/driver.go | 4 ++-- pkg/storage/driver/memory.go | 4 ++-- pkg/storage/driver/mock_test.go | 8 ++++---- pkg/storage/driver/secrets.go | 4 ++-- pkg/storage/driver/sql.go | 4 ++-- pkg/storage/storage.go | 4 ++-- pkg/tiller/release_modules.go | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index cca198916..86d8850d1 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -102,7 +102,7 @@ func (m *Manager) Build() error { return m.downloadAll(lock.Dependencies) } -// Update updates a local charts directory. +// Update a local charts directory. // // It first reads the requirements.yaml file, and then attempts to // negotiate versions based on that. It will download the versions diff --git a/pkg/kube/client.go b/pkg/kube/client.go index e78c10f2d..0319337a2 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -471,7 +471,7 @@ func (c *Client) cleanup(newlyCreatedResources []*resource.Info) (cleanupErrors return } -// Delete deletes Kubernetes resources from an io.reader. +// Delete Kubernetes resources from an io.reader. // // Namespace will set the namespace. func (c *Client) Delete(namespace string, reader io.Reader) error { diff --git a/pkg/plugin/installer/http_installer.go b/pkg/plugin/installer/http_installer.go index fd58b88ca..ee889eb4d 100644 --- a/pkg/plugin/installer/http_installer.go +++ b/pkg/plugin/installer/http_installer.go @@ -140,7 +140,7 @@ func (i *HTTPInstaller) Install() error { return i.link(src) } -// Update updates a local repository +// Update a local repository // Not implemented for now since tarball most likely will be packaged by version func (i *HTTPInstaller) Update() error { return fmt.Errorf("method Update() not implemented for HttpInstaller") diff --git a/pkg/plugin/installer/installer.go b/pkg/plugin/installer/installer.go index 76c751d50..2f422604c 100644 --- a/pkg/plugin/installer/installer.go +++ b/pkg/plugin/installer/installer.go @@ -38,7 +38,7 @@ type Installer interface { Install() error // Path is the directory of the installed plugin. Path() string - // Update updates a plugin to $HELM_HOME. + // Update a plugin to $HELM_HOME. Update() error } @@ -55,7 +55,7 @@ func Install(i Installer) error { return i.Install() } -// Update updates a plugin in $HELM_HOME. +// Update a plugin in $HELM_HOME. func Update(i Installer) error { if _, pathErr := os.Stat(i.Path()); os.IsNotExist(pathErr) { return errors.New("plugin does not exist") diff --git a/pkg/plugin/installer/local_installer.go b/pkg/plugin/installer/local_installer.go index f39086a6e..f7ee48f67 100644 --- a/pkg/plugin/installer/local_installer.go +++ b/pkg/plugin/installer/local_installer.go @@ -49,7 +49,7 @@ func (i *LocalInstaller) Install() error { return i.link(i.Source) } -// Update updates a local repository +// Update a local repository func (i *LocalInstaller) Update() error { debug("local repository is auto-updated") return nil diff --git a/pkg/plugin/installer/vcs_installer.go b/pkg/plugin/installer/vcs_installer.go index 9ec61ccfe..135260c18 100644 --- a/pkg/plugin/installer/vcs_installer.go +++ b/pkg/plugin/installer/vcs_installer.go @@ -91,7 +91,7 @@ func (i *VCSInstaller) Install() error { return i.link(i.Repo.LocalPath()) } -// Update updates a remote repository +// Update a remote repository func (i *VCSInstaller) Update() error { debug("updating %s", i.Repo.Remote()) if i.Repo.IsDirty() { diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go index 5b511d811..d8f5112de 100644 --- a/pkg/storage/driver/cfgmaps.go +++ b/pkg/storage/driver/cfgmaps.go @@ -174,7 +174,7 @@ func (cfgmaps *ConfigMaps) Create(key string, rls *rspb.Release) error { return nil } -// Update updates the ConfigMap holding the release. If not found +// Update the ConfigMap holding the release. If not found // the ConfigMap is created to hold the release. func (cfgmaps *ConfigMaps) Update(key string, rls *rspb.Release) error { // set labels for configmaps object meta data @@ -198,7 +198,7 @@ func (cfgmaps *ConfigMaps) Update(key string, rls *rspb.Release) error { return nil } -// Delete deletes the ConfigMap holding the release named by key. +// Delete the ConfigMap holding the release named by key. func (cfgmaps *ConfigMaps) Delete(key string) (rls *rspb.Release, err error) { // fetch the release to check existence if rls, err = cfgmaps.Get(key); err != nil { diff --git a/pkg/storage/driver/driver.go b/pkg/storage/driver/driver.go index 3bcbd4a7e..652ad8e43 100644 --- a/pkg/storage/driver/driver.go +++ b/pkg/storage/driver/driver.go @@ -40,7 +40,7 @@ type Creator interface { // Updator is the interface that wraps the Update method. // -// Update updates an existing release or returns +// Update an existing release or returns // ErrReleaseNotFound if the release does not exist. type Updator interface { Update(key string, rls *rspb.Release) error @@ -48,7 +48,7 @@ type Updator interface { // Deletor is the interface that wraps the Delete method. // -// Delete deletes the release named by key or returns +// Delete the release named by key or returns // ErrReleaseNotFound if the release does not exist. type Deletor interface { Delete(key string) (*rspb.Release, error) diff --git a/pkg/storage/driver/memory.go b/pkg/storage/driver/memory.go index 700b87e08..69a986fab 100644 --- a/pkg/storage/driver/memory.go +++ b/pkg/storage/driver/memory.go @@ -124,7 +124,7 @@ func (mem *Memory) Create(key string, rls *rspb.Release) error { return nil } -// Update updates a release or returns ErrReleaseNotFound. +// Update a release or returns ErrReleaseNotFound. func (mem *Memory) Update(key string, rls *rspb.Release) error { defer unlock(mem.wlock()) @@ -135,7 +135,7 @@ func (mem *Memory) Update(key string, rls *rspb.Release) error { return storageerrors.ErrReleaseNotFound(rls.Name) } -// Delete deletes a release or returns ErrReleaseNotFound. +// Delete a release or returns ErrReleaseNotFound. func (mem *Memory) Delete(key string) (*rspb.Release, error) { defer unlock(mem.wlock()) diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go index 06f48fba3..49d7c3705 100644 --- a/pkg/storage/driver/mock_test.go +++ b/pkg/storage/driver/mock_test.go @@ -137,7 +137,7 @@ func (mock *MockConfigMapsInterface) Create(cfgmap *v1.ConfigMap) (*v1.ConfigMap return cfgmap, nil } -// Update updates a ConfigMap. +// Update a ConfigMap. func (mock *MockConfigMapsInterface) Update(cfgmap *v1.ConfigMap) (*v1.ConfigMap, error) { name := cfgmap.ObjectMeta.Name if _, ok := mock.objects[name]; !ok { @@ -147,7 +147,7 @@ func (mock *MockConfigMapsInterface) Update(cfgmap *v1.ConfigMap) (*v1.ConfigMap return cfgmap, nil } -// Delete deletes a ConfigMap by name. +// Delete a ConfigMap by name. func (mock *MockConfigMapsInterface) Delete(name string, opts *metav1.DeleteOptions) error { if _, ok := mock.objects[name]; !ok { return apierrors.NewNotFound(v1.Resource("tests"), name) @@ -215,7 +215,7 @@ func (mock *MockSecretsInterface) Create(secret *v1.Secret) (*v1.Secret, error) return secret, nil } -// Update updates a Secret. +// Update a Secret. func (mock *MockSecretsInterface) Update(secret *v1.Secret) (*v1.Secret, error) { name := secret.ObjectMeta.Name if _, ok := mock.objects[name]; !ok { @@ -225,7 +225,7 @@ func (mock *MockSecretsInterface) Update(secret *v1.Secret) (*v1.Secret, error) return secret, nil } -// Delete deletes a Secret by name. +// Delete a Secret by name. func (mock *MockSecretsInterface) Delete(name string, opts *metav1.DeleteOptions) error { if _, ok := mock.objects[name]; !ok { return apierrors.NewNotFound(schema.GroupResource{Resource: "tests"}, name) diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go index 606d7960b..d5fedd088 100644 --- a/pkg/storage/driver/secrets.go +++ b/pkg/storage/driver/secrets.go @@ -174,7 +174,7 @@ func (secrets *Secrets) Create(key string, rls *rspb.Release) error { return nil } -// Update updates the Secret holding the release. If not found +// Update the Secret holding the release. If not found // the Secret is created to hold the release. func (secrets *Secrets) Update(key string, rls *rspb.Release) error { // set labels for secrets object meta data @@ -198,7 +198,7 @@ func (secrets *Secrets) Update(key string, rls *rspb.Release) error { return nil } -// Delete deletes the Secret holding the release named by key. +// Delete the Secret holding the release named by key. func (secrets *Secrets) Delete(key string) (rls *rspb.Release, err error) { // fetch the release to check existence if rls, err = secrets.Get(key); err != nil { diff --git a/pkg/storage/driver/sql.go b/pkg/storage/driver/sql.go index e1677c9ed..91216930a 100644 --- a/pkg/storage/driver/sql.go +++ b/pkg/storage/driver/sql.go @@ -281,7 +281,7 @@ func (s *SQL) Create(key string, rls *rspb.Release) error { return nil } -// Update updates a release. +// Update a release. func (s *SQL) Update(key string, rls *rspb.Release) error { body, err := encodeRelease(rls) if err != nil { @@ -308,7 +308,7 @@ func (s *SQL) Update(key string, rls *rspb.Release) error { return nil } -// Delete deletes a release or returns ErrReleaseNotFound. +// Delete a release or returns ErrReleaseNotFound. func (s *SQL) Delete(key string) (*rspb.Release, error) { transaction, err := s.db.Beginx() if err != nil { diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index e79cacc8d..5af3d1d79 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -60,7 +60,7 @@ func (s *Storage) Create(rls *rspb.Release) error { return s.Driver.Create(makeKey(rls.Name, rls.Version), rls) } -// Update update the release in storage. An error is returned if the +// Update the release in storage. An error is returned if the // storage backend fails to update the release or if the release // does not exist. func (s *Storage) Update(rls *rspb.Release) error { @@ -68,7 +68,7 @@ func (s *Storage) Update(rls *rspb.Release) error { return s.Driver.Update(makeKey(rls.Name, rls.Version), rls) } -// Delete deletes the release from storage. An error is returned if +// Delete the release from storage. An error is returned if // the storage backend fails to delete the release or if the release // does not exist. func (s *Storage) Delete(name string, version int32) (*rspb.Release, error) { diff --git a/pkg/tiller/release_modules.go b/pkg/tiller/release_modules.go index 360794481..a231b7220 100644 --- a/pkg/tiller/release_modules.go +++ b/pkg/tiller/release_modules.go @@ -85,7 +85,7 @@ func (m *LocalReleaseModule) Status(r *release.Release, req *services.GetRelease return env.KubeClient.Get(r.Namespace, bytes.NewBufferString(r.Manifest)) } -// Delete deletes the release and returns manifests that were kept in the deletion process +// Delete the release and returns manifests that were kept in the deletion process func (m *LocalReleaseModule) Delete(rel *release.Release, req *services.UninstallReleaseRequest, env *environment.Environment) (kept string, errs []error) { vs, err := GetVersionSet(m.clientset.Discovery()) if err != nil {