Merge pull request #6177 from mikesplain/make_upgrade_consistent

Add y flag for upgrade command for consistency

cmd/kops/upgrade_cluster.go

@@ -56,7 +56,7 @@ func init() {
 		},
 	}
 
-	cmd.Flags().BoolVar(&upgradeCluster.Yes, "yes", false, "Apply update")
+	cmd.Flags().BoolVarP(&upgradeCluster.Yes, "yes", "y", false, "Apply update")
 	cmd.Flags().StringVar(&upgradeCluster.Channel, "channel", "", "Channel to use for upgrade")
 
 	upgradeCmd.AddCommand(cmd)

docs/cli/kops_upgrade_cluster.md

@@ -25,7 +25,7 @@ kops upgrade cluster [flags]
 ```
       --channel string   Channel to use for upgrade
   -h, --help             help for cluster
-      --yes              Apply update
+  -y, --yes              Apply update
 ```
 
 ### Options inherited from parent commands