Merge pull request #5116 from GeorgianaElena/2i2c-aws-us-split

Follow up to 2i2c aws us split
2i2c-org · Nov 15, 2024 · 73b7f57 · 73b7f57
2 parents 374f89f + 04d8a08
commit 73b7f57
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/config/clusters/2i2c-aws-us/cosmicds.values.yaml b/config/clusters/2i2c-aws-us/cosmicds.values.yaml
@@ -40,6 +40,7 @@ jupyterhub:
   singleuser:
     nodeSelector:
       2i2c/hub-name: cosmicds
+      node.kubernetes.io/instance-type: r5.xlarge
     # No persistent storage should be kept to reduce any potential data
     # retention & privacy issues.
     # Ref https://github.com/2i2c-org/infrastructure/issues/2128#issuecomment-1635107926

diff --git a/config/clusters/2i2c-aws-us/staging.values.yaml b/config/clusters/2i2c-aws-us/staging.values.yaml
@@ -35,5 +35,6 @@ jupyterhub:
   singleuser:
     nodeSelector:
       2i2c/hub-name: staging
+      node.kubernetes.io/instance-type: r5.xlarge
     extraEnv:
       SCRATCH_BUCKET: s3://2i2c-aws-us-scratch-staging/$(JUPYTERHUB_USER)
diff --git a/eksctl/2i2c-aws-us.jsonnet b/eksctl/2i2c-aws-us.jsonnet
@@ -136,38 +136,38 @@ local notebookNodes = [
     // itcoocean
     {
         instanceType: "r5.xlarge",
-        namePrefix: "itcoocean",
+        namePrefix: "nb-itcoocean",
         labels+: { "2i2c/hub-name": "itcoocean" },
         tags+: { "2i2c:hub-name": "itcoocean" }
     },
     {
         instanceType: "r5.4xlarge",
-        namePrefix: "itcoocean",
+        namePrefix: "nb-itcoocean",
         labels+: { "2i2c/hub-name": "itcoocean" },
         tags+: { "2i2c:hub-name": "itcoocean" }
     },
     {
         instanceType: "r5.16xlarge",
-        namePrefix: "itcoocean",
+        namePrefix: "nb-itcoocean",
         labels+: { "2i2c/hub-name": "itcoocean" },
         tags+: { "2i2c:hub-name": "itcoocean" }
     },
     // cosmicds
     {
         instanceType: "r5.xlarge",
-        namePrefix: "cosmicds",
+        namePrefix: "nb-cosmicds",
         labels+: { "2i2c/hub-name": "cosmicds" },
         tags+: { "2i2c:hub-name": "cosmicds" }
     },
     {
         instanceType: "r5.4xlarge",
-        namePrefix: "cosmicds",
+        namePrefix: "nb-cosmicds",
         labels+: { "2i2c/hub-name": "cosmicds" },
         tags+: { "2i2c:hub-name": "cosmicds" }
     },
     {
         instanceType: "r5.16xlarge",
-        namePrefix: "cosmicds",
+        namePrefix: "nb-cosmicds",
         labels+: { "2i2c/hub-name": "cosmicds" },
         tags+: { "2i2c:hub-name": "cosmicds" }
     },
@@ -186,7 +186,7 @@ local daskNodes = [
     // node pool, see https://github.com/2i2c-org/infrastructure/issues/2687.
     //
     {
-        namePrefix: "dask-staging",
+        namePrefix: "dask-dask-staging",
         labels+: { "2i2c/hub-name": "dask-staging" },
         tags+: { "2i2c:hub-name": "dask-staging" },
         instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }