change flag to --encrypt-etcd-storage=true

cmd/kops/create_cluster.go

@@ -56,7 +56,7 @@ type CreateClusterOptions struct {
 	MasterSize           string
 	MasterCount          int32
 	NodeCount            int32
-	EncryptVolume        bool
+	EncryptEtcdStorage   bool
 	Project              string
 	KubernetesVersion    string
 	OutDir               string
@@ -167,7 +167,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 
 	cmd.Flags().Int32Var(&options.MasterCount, "master-count", options.MasterCount, "Set the number of masters.  Defaults to one master per master-zone")
 	cmd.Flags().Int32Var(&options.NodeCount, "node-count", options.NodeCount, "Set the number of nodes")
-	cmd.Flags().BoolVar(&options.EncryptVolume, "encrypt-volume", options.EncryptVolume, "Generate key in aws kms and use it for encrypt etcd volumes")
+	cmd.Flags().BoolVar(&options.EncryptEtcdStorage, "encrypt-etcd-storage", options.EncryptEtcdStorage, "Generate key in aws kms and use it for encrypt etcd volumes")
 
 	cmd.Flags().StringVar(&options.Image, "image", options.Image, "Image to use")
 
@@ -438,8 +438,8 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
 
 			for i, ig := range masters {
 				m := &api.EtcdMemberSpec{}
-				if c.EncryptVolume {
-					m.EncryptedVolume = &c.EncryptVolume
+				if c.EncryptEtcdStorage {
+					m.EncryptedVolume = &c.EncryptEtcdStorage
 				}
 				m.Name = names[i]
 

tests/integration/create_cluster/ha_encrypt/options.yaml

@@ -9,4 +9,4 @@ MasterZones:
 - us-test-1c
 Cloud: aws
 KubernetesVersion: v1.6.0-alpha.3
-EncryptVolume: true
+EncryptEtcdStorage: true