Merge pull request #4080 from consideRatio/pr/something4

k8s maintenance, EKS: align eksctl config files with each other

Author: consideRatio

eksctl/2i2c-aws-us.jsonnet

@@ -118,7 +118,6 @@ local daskNodes = [
                 "hub.jupyter.org_dedicated": "user:NoSchedule",
                 "hub.jupyter.org/dedicated": "user:NoSchedule"
             },
-
         } + n for n in notebookNodes
     ] + ( if daskNodes != null then
         [

eksctl/nasa-esdis.jsonnet

@@ -65,8 +65,10 @@ local daskNodes = [];
         },
     ],
     nodeGroups: [
-        ng {
-            name: 'core-a',
+        ng + {
+            namePrefix: 'core',
+            nameSuffix: 'a',
+            nameIncludeInstanceType: false,
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/nasa-esdis.key.pub'
@@ -80,10 +82,8 @@ local daskNodes = [];
             },
         },
     ] + [
-        ng {
-            // NodeGroup names can't have a '.' in them, while
-            // instanceTypes always have a .
-            name: "nb-%s" % std.strReplace(n.instanceType, ".", "-"),
+        ng + {
+            namePrefix: "nb",
             availabilityZones: [nodeAz],
             minSize: 0,
             maxSize: 500,
@@ -102,10 +102,8 @@ local daskNodes = [];
         } + n for n in notebookNodes
     ] + ( if daskNodes != null then
         [
-        ng {
-            // NodeGroup names can't have a '.' in them, while
-            // instanceTypes always have a .
-            name: "dask-%s" % std.strReplace(n.instancesDistribution.instanceTypes[0], ".", "-"),
+        ng + {
+            namePrefix: "dask",
             availabilityZones: [nodeAz],
             minSize: 0,
             maxSize: 500,

eksctl/openscapes.jsonnet

@@ -92,11 +92,6 @@ local daskNodes = [
                 "hub.jupyter.org/node-purpose": "core",
                 "k8s.dask.org/node-purpose": "core"
             },
-            iam: {
-                withAddonPolicies: {
-                    autoScaler: true
-                },
-            },
         },
     ] + [
         ng + {

eksctl/ubc-eoas.jsonnet

@@ -82,11 +82,6 @@ local daskNodes = [];
                 "hub.jupyter.org/node-purpose": "core",
                 "k8s.dask.org/node-purpose": "core"
             },
-            iam+: {
-                withAddonPolicies+: {
-                    ebs: true,
-                },
-            },
         },
     ] + [
         ng + {
@@ -106,7 +101,6 @@ local daskNodes = [];
                 "hub.jupyter.org_dedicated": "user:NoSchedule",
                 "hub.jupyter.org/dedicated": "user:NoSchedule"
             },
-
         } + n for n in notebookNodes
     ] + ( if daskNodes != null then
         [