Merge pull request #5104 from sgibson91/nasa-ghg/dedicated-nodegroups

Create hub-specific nodegroups for nasa-ghg
2i2c-org · Nov 14, 2024 · 77619f1 · 77619f1
2 parents 246edd9 + fbef7da
commit 77619f1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/config/clusters/nasa-ghg/prod.values.yaml b/config/clusters/nasa-ghg/prod.values.yaml
@@ -16,3 +16,6 @@ basehub:
       config:
         GitHubOAuthenticator:
           oauth_callback_url: https://hub.ghg.center/hub/oauth_callback
+    singleuser:
+      nodeSelector:
+        2i2c/hub-name: prod
diff --git a/config/clusters/nasa-ghg/staging.values.yaml b/config/clusters/nasa-ghg/staging.values.yaml
@@ -24,6 +24,8 @@ basehub:
           from jupyterhub_fancy_profiles import setup_ui
           setup_ui(c)
     singleuser:
+      nodeSelector:
+        2i2c/hub-name: staging
       profileList:
         - display_name: "Only Profile Available, this info is not shown in the UI"
           slug: only-choice

diff --git a/eksctl/nasa-ghg.jsonnet b/eksctl/nasa-ghg.jsonnet
@@ -25,9 +25,42 @@ 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" , nameSuffix : "b" },
-    { instanceType: "r5.16xlarge" },
+    { 
+        instanceType: "r5.xlarge",
+        namePrefix: "nb-staging",
+        labels+: { "2i2c/hub-name": "staging" },
+        tags+: { "2i2c:hub-name": "staging" },
+    },
+    { 
+        instanceType: "r5.xlarge",
+        namePrefix: "nb-prod",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: { "2i2c:hub-name": "prod" },
+    },
+    { 
+        instanceType: "r5.4xlarge",
+        namePrefix: "nb-staging",
+        labels+: { "2i2c/hub-name": "staging" },
+        tags+: { "2i2c:hub-name": "staging" },
+    },
+    { 
+        instanceType: "r5.4xlarge",
+        namePrefix: "nb-prod",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: { "2i2c:hub-name": "prod" },
+    },
+    { 
+        instanceType: "r5.16xlarge",
+        namePrefix: "nb-staging",
+        labels+: { "2i2c/hub-name": "staging" },
+        tags+: { "2i2c:hub-name": "staging" },
+    },
+    { 
+        instanceType: "r5.16xlarge",
+        namePrefix: "nb-prod",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: { "2i2c:hub-name": "prod" },
+    },
 ];
 local daskNodes = [
     // Node definitions for dask worker nodes. Config here is merged