Set spot to default (#610)

(cherry picked from commit cf1412e)

Author: vishalbollu

cli/cmd/lib_cluster_config.go

@@ -163,10 +163,18 @@ func confirmClusterConfig(clusterConfig *clusterconfig.ClusterConfig, awsCreds *
 	items = append(items, table.KV{K: clusterconfig.RegionUserFacingKey, V: clusterConfig.Region})
 	items = append(items, table.KV{K: clusterconfig.BucketUserFacingKey, V: clusterConfig.Bucket})
 
-	items = append(items, table.KV{K: clusterconfig.SpotUserFacingKey, V: s.YesNo(clusterConfig.Spot != nil && *clusterConfig.Spot)})
 	items = append(items, table.KV{K: clusterconfig.InstanceTypeUserFacingKey, V: *clusterConfig.InstanceType})
 	items = append(items, table.KV{K: clusterconfig.MinInstancesUserFacingKey, V: *clusterConfig.MinInstances})
 	items = append(items, table.KV{K: clusterconfig.MaxInstancesUserFacingKey, V: *clusterConfig.MaxInstances})
+
+	if clusterConfig.Spot != nil && *clusterConfig.Spot != *prevConfig.Spot {
+		items = append(items, table.KV{K: clusterconfig.SpotUserFacingKey, V: s.YesNo(clusterConfig.Spot != nil && *clusterConfig.Spot)})
+		items = append(items, table.KV{K: clusterconfig.InstanceDistributionUserFacingKey, V: clusterConfig.SpotConfig.InstanceDistribution})
+		items = append(items, table.KV{K: clusterconfig.OnDemandBaseCapacityUserFacingKey, V: *clusterConfig.SpotConfig.OnDemandBaseCapacity})
+		items = append(items, table.KV{K: clusterconfig.OnDemandPercentageAboveBaseCapacityUserFacingKey, V: *clusterConfig.SpotConfig.OnDemandPercentageAboveBaseCapacity})
+		items = append(items, table.KV{K: clusterconfig.MaxPriceUserFacingKey, V: *clusterConfig.SpotConfig.MaxPrice})
+		items = append(items, table.KV{K: clusterconfig.InstancePoolsUserFacingKey, V: *clusterConfig.SpotConfig.InstancePools})
+	}
 	if clusterConfig.InstanceVolumeSize != prevConfig.InstanceVolumeSize {
 		items = append(items, table.KV{K: clusterconfig.InstanceVolumeSizeUserFacingKey, V: clusterConfig.InstanceVolumeSize})
 	}

docs/cluster/config.md

@@ -42,8 +42,8 @@ cluster_name: cortex
 # whether to collect anonymous usage stats and error reports (default: true)
 telemetry: true
 
-# whether to use spot instances in the cluster (default: true)
-spot: true
+# whether to use spot instances in the cluster (default: false)
+spot: false
 
 spot_config:
   # additional instances with identical or better specs than the primary instance type (defaults to 2 instances sorted by price)
@@ -53,6 +53,7 @@ spot_config:
   on_demand_base_capacity: 0
 
   # percentage of on demand instances to use after the on demand base capacity has been met [0, 100] (default: 1)
+  # note: setting this to 0 may hinder cluster scale up when spot instances are not available
   on_demand_percentage_above_base_capacity: 1
 
   # max price for instances (defaults to the on demand price of the primary instance type)

pkg/lib/clusterconfig/clusterconfig.go

@@ -111,8 +111,10 @@ var UserValidation = &cr.StructValidation{
 			},
 		},
 		{
-			StructField:       "Spot",
-			BoolPtrValidation: &cr.BoolPtrValidation{},
+			StructField: "Spot",
+			BoolPtrValidation: &cr.BoolPtrValidation{
+				Default: pointer.Bool(false),
+			},
 		},
 		{
 			StructField: "SpotConfig",
@@ -562,17 +564,6 @@ func InstallPrompt(clusterConfig *ClusterConfig, awsAccessKeyID string, awsSecre
 					Default: defaultBucket,
 				},
 			},
-			{
-				StructField: "Spot",
-				PromptOpts: &prompt.Options{
-					Prompt:     "use spot instances (y/n)",
-					DefaultStr: "y",
-				},
-				BoolPtrValidation: &cr.BoolPtrValidation{
-					Required:  true,
-					StrToBool: map[string]bool{"y": true, "n": false},
-				},
-			},
 			{
 				StructField: "InstanceType",
 				PromptOpts: &prompt.Options{
@@ -717,13 +708,13 @@ func (cc *ClusterConfig) UserFacingTable() []table.KV {
 	items = append(items, table.KV{K: ClusterNameUserFacingKey, V: cc.ClusterName})
 	items = append(items, table.KV{K: RegionUserFacingKey, V: *cc.Region})
 	items = append(items, table.KV{K: BucketUserFacingKey, V: *cc.Bucket})
-	items = append(items, table.KV{K: SpotUserFacingKey, V: s.YesNo(*cc.Spot)})
 	items = append(items, table.KV{K: InstanceTypeUserFacingKey, V: *cc.InstanceType})
 	items = append(items, table.KV{K: MinInstancesUserFacingKey, V: *cc.MinInstances})
 	items = append(items, table.KV{K: MaxInstancesUserFacingKey, V: *cc.MaxInstances})
 	items = append(items, table.KV{K: InstanceVolumeSizeUserFacingKey, V: cc.InstanceVolumeSize})
+	items = append(items, table.KV{K: SpotUserFacingKey, V: s.YesNo(*cc.Spot)})
 
-	if cc.Spot != nil {
+	if cc.Spot != nil && *cc.Spot {
 		items = append(items, table.KV{K: InstanceDistributionUserFacingKey, V: cc.SpotConfig.InstanceDistribution})
 		items = append(items, table.KV{K: OnDemandBaseCapacityUserFacingKey, V: *cc.SpotConfig.OnDemandBaseCapacity})
 		items = append(items, table.KV{K: OnDemandPercentageAboveBaseCapacityUserFacingKey, V: *cc.SpotConfig.OnDemandPercentageAboveBaseCapacity})