Skip to content

Commit 566cddf

Browse files
committed
Replace completeley instance types data when loading config
With this commit we replace completely instance types data rather than just update it to make sure data is consistent with the currently loaded configuration. Additionally we mark instance_types_data parameter's update policy as UNSUPPORTED to avoid changes that may break clusters with sge or torque. Signed-off-by: ddeidda <[email protected]>
1 parent ebc18be commit 566cddf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cli/src/pcluster/config/mappings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@
10321032
"type": JsonCfnParam,
10331033
"default": {},
10341034
"cfn_param_mapping": "InstanceTypesData",
1035-
"update_policy": UpdatePolicy.IGNORED
1035+
"update_policy": UpdatePolicy.UNSUPPORTED
10361036
}),
10371037
]
10381038

cli/src/pcluster/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ def __init__(self, instance_type_data):
12581258
@staticmethod
12591259
def load_additional_instance_types_data(instance_types_data):
12601260
"""Load additional data to describe instance types."""
1261-
InstanceTypeInfo.__additional_instance_types_data.update(instance_types_data)
1261+
InstanceTypeInfo.__additional_instance_types_data = instance_types_data if instance_types_data else {}
12621262

12631263
@staticmethod
12641264
def clear_additional_instance_types_data():
@@ -1353,7 +1353,7 @@ def is_efa_supported(self):
13531353

13541354
def supported_usage_classes(self):
13551355
"""Return the list supported usage classes."""
1356-
supported_classes = self.instance_type_data.get("SupportedUsageClasses", [])
1356+
supported_classes = list(self.instance_type_data.get("SupportedUsageClasses", []))
13571357
if "on-demand" in supported_classes:
13581358
# Replace official AWS with internal naming convention
13591359
supported_classes.remove("on-demand")

0 commit comments

Comments
 (0)