helm
/
helm
mirror of https://github.com/helm/helm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(helm): update helm reset --force tip for clarity 

Updates helm reset error message to clarify that --force will not remove releases.

Closes #3394
This commit is contained in:
Justin Scott 2018-02-08 16:46:38 -08:00
parent 7609ad29e2
commit 084a2bb945
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/helm/reset.go
View File

@ -77,7 +77,7 @@ func newResetCmd(client helm.Interface, out io.Writer) *cobra.Command {
}
f := cmd.Flags()
f.BoolVarP(&d.force, "force", "f", false, "forces Tiller uninstall even if there are releases installed, or if Tiller is not in ready state")
f.BoolVarP(&d.force, "force", "f", false, "forces Tiller uninstall even if there are releases installed, or if Tiller is not in ready state. Releases are not deleted.)")
f.BoolVar(&d.removeHelmHome, "remove-helm-home", false, "if set deletes $HELM_HOME")
return cmd
@ -101,7 +101,7 @@ func (d *resetCmd) run() error {
}
if !d.force && res != nil && len(res.Releases) > 0 {
return fmt.Errorf("there are still %d deployed releases (Tip: use --force)", len(res.Releases))
return fmt.Errorf("there are still %d deployed releases (Tip: use --force to remove Tiller. Releases will not be deleted.)", len(res.Releases))
}
if err := installer.Uninstall(d.kubeClient, &installer.Options{Namespace: d.namespace}); err != nil {

2
cmd/helm/reset_test.go
View File

@ -121,7 +121,7 @@ func TestReset_deployedReleases(t *testing.T) {
namespace: core.NamespaceDefault,
}
err = cmd.run()
expected := "there are still 1 deployed releases (Tip: use --force)"
expected := "there are still 1 deployed releases (Tip: use --force to remove Tiller. Releases will not be deleted.)"
if !strings.Contains(err.Error(), expected) {
t.Errorf("unexpected error: %v", err)
}

4
docs/helm/helm_reset.md
View File

@ -18,7 +18,7 @@ helm reset
### Options
```
-f, --force forces Tiller uninstall even if there are releases installed, or if Tiller is not in ready state
-f, --force forces Tiller uninstall even if there are releases installed, or if Tiller is not in ready state. Releases are not deleted.)
--remove-helm-home if set deletes $HELM_HOME
--tls enable TLS for request
--tls-ca-cert string path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@ -40,4 +40,4 @@ helm reset
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
###### Auto generated by spf13/cobra on 25-Jan-2018
###### Auto generated by spf13/cobra on 8-Feb-2018