Merge pull request #3475 from jascott1/3394_reset

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

cmd/helm/reset.go

@@ -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 {

cmd/helm/reset_test.go

@@ -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)
 	}

docs/helm/helm_reset.md

@@ -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