eksctl: upgrade 7 EKS clusters at 1.25 to 1.27

2i2c-org · Nov 19, 2023 · d16ac2a · d16ac2a
1 parent f036995
commit d16ac2a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 15 deletions.
diff --git a/eksctl/2i2c-aws-us.jsonnet b/eksctl/2i2c-aws-us.jsonnet
@@ -57,7 +57,7 @@ local daskNodes = [
     metadata+: {
         name: "2i2c-aws-us",
         region: clusterRegion,
-        version: '1.25'
+        version: '1.27',
     },
     availabilityZones: masterAzs,
     iam: {
@@ -85,7 +85,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-a',
+            name: 'core-b',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/2i2c-aws-us.key.pub'

diff --git a/eksctl/gridsst.jsonnet b/eksctl/gridsst.jsonnet
@@ -25,10 +25,19 @@ local nodeAz = "us-west-2a";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
+    # FIXME: Ensure gridsst wants minSize 1. Before an event it was set to 0,
+    #        but as part of scaling down after the event it stayed at one.
+    #
+    #        scale up:   https://github.com/2i2c-org/infrastructure/pull/1836
+    #        scale down: https://github.com/2i2c-org/infrastructure/pull/1844
+    #
     { instanceType: "m5.large", minSize: 1 },
     { instanceType: "m5.xlarge", minSize: 0 },
     { instanceType: "m5.2xlarge", minSize: 0 },
     { instanceType: "m5.8xlarge", minSize: 0 },
+    { instanceType: "r5.xlarge", minSize: 0 },
+    { instanceType: "r5.4xlarge", minSize: 0 },
+    { instanceType: "r5.16xlarge", minSize: 0 },
     {
         instanceType: "g4dn.xlarge", minSize: 0,
         tags+: {
@@ -58,7 +67,7 @@ local daskNodes = [
     metadata+: {
         name: "gridsst",
         region: clusterRegion,
-        version: '1.25'
+        version: "1.27",
     },
     availabilityZones: masterAzs,
     iam: {
@@ -86,7 +95,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-a',
+            name: 'core-b',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/gridsst.key.pub'
@@ -119,7 +128,6 @@ local daskNodes = [
                 "hub.jupyter.org_dedicated": "user:NoSchedule",
                 "hub.jupyter.org/dedicated": "user:NoSchedule"
             },
-
         } + n for n in notebookNodes
     ] + [
         ng {

diff --git a/eksctl/jupyter-meets-the-earth.jsonnet b/eksctl/jupyter-meets-the-earth.jsonnet
@@ -25,6 +25,9 @@ local nodeAz = "us-west-2a";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
+    { instanceType: "r5.xlarge" },
+    { instanceType: "r5.4xlarge" },
+    { instanceType: "r5.16xlarge" },
     { instanceType: "m5.xlarge" },
     { instanceType: "m5.4xlarge" },
     { instanceType: "m5.16xlarge" },
@@ -78,7 +81,7 @@ local daskNodes = [
     metadata+: {
         name: "jupyter-meets-the-earth",
         region: clusterRegion,
-        version: '1.25'
+        version: "1.27",
     },
     availabilityZones: masterAzs,
     iam: {
@@ -106,7 +109,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-a',
+            name: 'core-b',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/jupyter-meets-the-earth.key.pub'

diff --git a/eksctl/nasa-cryo.jsonnet b/eksctl/nasa-cryo.jsonnet
@@ -25,6 +25,8 @@ local nodeAz = "us-west-2a";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
+    # FIXME: The r5.xlarge node group is still at version 1.25 and should be
+    #        upgraded by deleting it and adding it back when possible.
     { instanceType: "r5.xlarge" },
     { instanceType: "r5.4xlarge" },
     { instanceType: "r5.16xlarge" },
@@ -60,7 +62,7 @@ local daskNodes = [
     metadata+: {
         name: "nasa-cryo",
         region: clusterRegion,
-        version: '1.25'
+        version: "1.27",
     },
     availabilityZones: masterAzs,
     iam: {
@@ -88,7 +90,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-a',
+            name: 'core-b',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/nasa-cryo.key.pub'

diff --git a/eksctl/nasa-veda.jsonnet b/eksctl/nasa-veda.jsonnet
@@ -51,7 +51,7 @@ local daskNodes = [
     metadata+: {
         name: "nasa-veda",
         region: clusterRegion,
-        version: '1.25'
+        version: "1.27",
     },
     availabilityZones: masterAzs,
     iam: {
@@ -79,7 +79,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-b',
+            name: 'core-a',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/nasa-veda.key.pub'

diff --git a/eksctl/smithsonian.jsonnet b/eksctl/smithsonian.jsonnet
@@ -56,7 +56,7 @@ local daskNodes = [
     metadata+: {
         name: "smithsonian",
         region: clusterRegion,
-        version: '1.25'
+        version: "1.27",
     },
     availabilityZones: masterAzs,
     iam: {
@@ -84,7 +84,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-a',
+            name: 'core-b',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/smithsonian.key.pub'

diff --git a/eksctl/victor.jsonnet b/eksctl/victor.jsonnet
@@ -29,6 +29,9 @@ local notebookNodes = [
     { instanceType: "m5.xlarge" },
     { instanceType: "m5.2xlarge" },
     { instanceType: "m5.8xlarge" },
+    { instanceType: "r5.xlarge" },
+    { instanceType: "r5.4xlarge" },
+    { instanceType: "r5.16xlarge" },
 ];
 
 local daskNodes = [
@@ -52,7 +55,7 @@ local daskNodes = [
     metadata+: {
         name: "victor",
         region: clusterRegion,
-        version: '1.25'
+        version: "1.27",
     },
     availabilityZones: masterAzs,
     iam: {
@@ -80,7 +83,7 @@ local daskNodes = [
     ],
     nodeGroups: [
         ng {
-            name: 'core-b',
+            name: 'core-a',
             availabilityZones: [nodeAz],
             ssh: {
                 publicKeyPath: 'ssh-keys/victor.key.pub'