Merge pull request #152 from GetSimpl/fix/service-placement-default-t…

…o-spot Fix/service placement default to spot
GetSimpl · May 27, 2024 · ab067cd · ab067cd
2 parents 88230e3 + eaf78a7
commit ab067cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cloudlift/config/environment_configuration.py b/cloudlift/config/environment_configuration.py
@@ -302,7 +302,10 @@ def _validate_changes(self, configuration):
                                 "key_name": {"type": "string"},
                                 "allocation_strategy": {"type": "string"},
                                 "spot_instance_pools": {"type": "integer"},
-                                "ecs_instance_default_lifecycle_type": {"type": "string"}
+                                "ecs_instance_default_lifecycle_type":  {
+                                    "type": "string",
+                                    "pattern": "^(spot|ondemand)$"
+                                }
                             },
                             "required": [
                                 "min_instances",

diff --git a/cloudlift/deployment/service_template_generator.py b/cloudlift/deployment/service_template_generator.py
@@ -234,7 +234,8 @@ def _add_service(self, service_name, config):
         if 'fargate' not in config:
             for key in self.environment_stack["Outputs"]:
                 if key["OutputKey"] == 'ECSClusterDefaultInstanceLifecycle':
-                    spot_deployment = False if ImportValue("{self.env}ECSClusterDefaultInstanceLifecycle".format(**locals())) == 'ondemand' else True
+                    instance_lifecycle = key["OutputValue"]
+                    spot_deployment = instance_lifecycle == 'spot'
                     placement_constraint = {
                         "PlacementConstraints": [PlacementConstraint(
                             Type='memberOf',

diff --git a/cloudlift/version/__init__.py b/cloudlift/version/__init__.py
@@ -1 +1 @@
-VERSION = '2.0.6'
+VERSION = '2.0.6'