Autofill spot when user specified spot is true

(cherry picked from commit 1f037cc)

Author: vishalbollu

cli/cmd/lib_cluster_config.go

@@ -87,11 +87,6 @@ func getUpdateClusterConfig(cachedClusterConfig *clusterconfig.ClusterConfig, aw
 			return nil, err
 		}
 
-		err = userClusterConfig.AutoFillSpot()
-		if err != nil {
-			return nil, err
-		}
-
 		userClusterConfig.ClusterName = cachedClusterConfig.ClusterName
 		userClusterConfig.Region = cachedClusterConfig.Region
 
@@ -114,6 +109,13 @@ func getUpdateClusterConfig(cachedClusterConfig *clusterconfig.ClusterConfig, aw
 		}
 		userClusterConfig.Spot = cachedClusterConfig.Spot
 
+		if userClusterConfig.Spot != nil && *userClusterConfig.Spot {
+			err = userClusterConfig.AutoFillSpot()
+			if err != nil {
+				return nil, err
+			}
+		}
+
 		if userClusterConfig.SpotConfig != nil && s.Obj(userClusterConfig.SpotConfig) != s.Obj(cachedClusterConfig.SpotConfig) {
 			if cachedClusterConfig.SpotConfig == nil {
 				return nil, clusterconfig.ErrorConfiguredWhenSpotIsNotEnabled(clusterconfig.SpotConfigKey)