Merge pull request #7939 from GeorgianaElena/fix-spot-instances

Fix dask nodepools for a few more clusters

Author: GeorgianaElena

eksctl/aimatx-2i2c-hub.jsonnet

@@ -12,10 +12,12 @@ local c = cluster.makeCluster(
     'r5.16xlarge',
   ],
   daskInstanceTypes=[
-    // Allow for a range of spot instance types
-    'r5.4xlarge',
-    'r7i.4xlarge',
-    'r6i.4xlarge',
+    [
+      // Allow for a range of spot instance types
+      'r5.4xlarge',
+      'r7i.4xlarge',
+      'r6i.4xlarge',
+    ],
   ],
   hubs=['staging', 'prod'],
   notebookGPUNodeGroups=[

eksctl/nmfs-openscapes.jsonnet

@@ -13,18 +13,20 @@ local c = cluster.withNodeGroupConfigOverride(
       'r5.16xlarge',
     ],
     daskInstanceTypes=[
-      // Allow for a range of spot instance types
-      'r5.4xlarge',
-      'r7i.4xlarge',
-      'r6i.4xlarge',
+      [
+        // Allow for a range of spot instance types
+        'r5.4xlarge',
+        'r7i.4xlarge',
+        'r6i.4xlarge',
+      ],
     ],
     hubs=['staging', 'prod', 'workshop', 'noaa-only'],
     notebookGPUNodeGroups=[
       {
         instanceType: 'g4dn.xlarge',
       },
     ],
-    nodeGroupGenerations=['b', 'c'],
+    nodeGroupGenerations=['c'],
   ),
   kind='core',
   overrides={ maxSize: 2 }

eksctl/openscapeshub.jsonnet

@@ -13,10 +13,12 @@ local c = cluster.withNodeGroupConfigOverride(
       'r5.16xlarge',
     ],
     daskInstanceTypes=[
-      // Allow for a range of spot instance types
-      'r5.4xlarge',
-      'r7i.4xlarge',
-      'r6i.4xlarge',
+      [
+        // Allow for a range of spot instance types
+        'r5.4xlarge',
+        'r7i.4xlarge',
+        'r6i.4xlarge',
+      ],
     ],
     hubs=[
       'staging',

eksctl/victor.jsonnet

@@ -12,10 +12,12 @@ local c = cluster.makeCluster(
     'r5.16xlarge',
   ],
   daskInstanceTypes=[
-    // Allow for a range of spot instance types
-    'r5.4xlarge',
-    'r7i.4xlarge',
-    'r6i.4xlarge',
+    [
+      // Allow for a range of spot instance types
+      'r5.4xlarge',
+      'r7i.4xlarge',
+      'r6i.4xlarge',
+    ],
   ],
   hubs=[
     'staging',