Merge pull request #1703 from nmakhotkin/rename_restart

Rename '--restart' option to '--recreate-pods'

cmd/helm/rollback.go

@@ -35,7 +35,7 @@ type rollbackCmd struct {
 	name         string
 	revision     int32
 	dryRun       bool
-	restart      bool
+	recreate     bool
 	disableHooks bool
 	out          io.Writer
 	client       helm.Interface
@@ -72,7 +72,7 @@ func newRollbackCmd(c helm.Interface, out io.Writer) *cobra.Command {
 
 	f := cmd.Flags()
 	f.BoolVar(&rollback.dryRun, "dry-run", false, "simulate a rollback")
-	f.BoolVar(&rollback.restart, "restart", false, "performs pods restart for the resource if applicable")
+	f.BoolVar(&rollback.recreate, "recreate-pods", false, "performs pods restart for the resource if applicable")
 	f.BoolVar(&rollback.disableHooks, "no-hooks", false, "prevent hooks from running during rollback")
 
 	return cmd
@@ -82,7 +82,7 @@ func (r *rollbackCmd) run() error {
 	_, err := r.client.RollbackRelease(
 		r.name,
 		helm.RollbackDryRun(r.dryRun),
-		helm.RollbackRecreate(r.restart),
+		helm.RollbackRecreate(r.recreate),
 		helm.RollbackDisableHooks(r.disableHooks),
 		helm.RollbackVersion(r.revision),
 	)

cmd/helm/upgrade.go

@@ -54,7 +54,7 @@ type upgradeCmd struct {
 	out          io.Writer
 	client       helm.Interface
 	dryRun       bool
-	restart      bool
+	recreate     bool
 	disableHooks bool
 	valueFiles   valueFiles
 	values       string
@@ -93,7 +93,7 @@ func newUpgradeCmd(client helm.Interface, out io.Writer) *cobra.Command {
 	f := cmd.Flags()
 	f.VarP(&upgrade.valueFiles, "values", "f", "specify values in a YAML file (can specify multiple)")
 	f.BoolVar(&upgrade.dryRun, "dry-run", false, "simulate an upgrade")
-	f.BoolVar(&upgrade.restart, "restart", false, "performs pods restart for the resource if applicable")
+	f.BoolVar(&upgrade.recreate, "recreate-pods", false, "performs pods restart for the resource if applicable")
 	f.StringVar(&upgrade.values, "set", "", "set values on the command line. Separate values with commas: key1=val1,key2=val2")
 	f.BoolVar(&upgrade.disableHooks, "disable-hooks", false, "disable pre/post upgrade hooks. DEPRECATED. Use no-hooks")
 	f.BoolVar(&upgrade.disableHooks, "no-hooks", false, "disable pre/post upgrade hooks")
@@ -151,7 +151,7 @@ func (u *upgradeCmd) run() error {
 		chartPath,
 		helm.UpdateValueOverrides(rawVals),
 		helm.UpgradeDryRun(u.dryRun),
-		helm.UpgradeRecreate(u.restart),
+		helm.UpgradeRecreate(u.recreate),
 		helm.UpgradeDisableHooks(u.disableHooks))
 	if err != nil {
 		return fmt.Errorf("UPGRADE FAILED: %v", prettyError(err))