opensci: add node selectors

2i2c-org · Nov 15, 2024 · e06ef81 · e06ef81
1 parent bfec9ce
commit e06ef81
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/config/clusters/opensci/big-binder.values.yaml b/config/clusters/opensci/big-binder.values.yaml
@@ -52,6 +52,7 @@ jupyterhub:
       # Schedule users on the smallest instance
       # https://github.com/2i2c-org/infrastructure/issues/4241
       node.kubernetes.io/instance-type: r5.xlarge
+      2i2c/hub-name: big-binder
     cloudMetadata:
       blockWithIptables: false
     cpu:
@@ -100,6 +101,7 @@ binderhub-service:
       # Schedule dockerApi pods to run on the smallest user nodes only
       # https://github.com/2i2c-org/infrastructure/issues/4241
       node.kubernetes.io/instance-type: r5.xlarge
+      2i2c/hub-name: big-binder
   ingress:
     enabled: true
     hosts: [big.binder.opensci.2i2c.cloud]
@@ -114,6 +116,7 @@ binderhub-service:
         # Schedule builder pods to run on the smallest user nodes only
         # https://github.com/2i2c-org/infrastructure/issues/4241
         node.kubernetes.io/instance-type: r5.xlarge
+        2i2c/hub-name: big-binder
     BinderHub:
       base_url: /
       hub_url: https://hub.big.binder.opensci.2i2c.cloud

diff --git a/config/clusters/opensci/climaterisk.values.yaml b/config/clusters/opensci/climaterisk.values.yaml
@@ -32,6 +32,7 @@ jupyterhub:
       tag: "09c3a11f1698"
     nodeSelector:
       node.kubernetes.io/instance-type: r5.4xlarge
+      2i2c/hub-name: climaterisk
     memory:
       guarantee: 15929958203
       limit: 15929958203

diff --git a/config/clusters/opensci/sciencecore.values.yaml b/config/clusters/opensci/sciencecore.values.yaml
@@ -39,6 +39,8 @@ jupyterhub:
     singleuserAdmin:
       serviceAccountName: admin-sa
   singleuser:
+    nodeSelector:
+      2i2c/hub-name: sciencecore
     defaultUrl: /lab
     extraEnv:
       SCRATCH_BUCKET: s3://opensci-scratch-sciencecore/$(JUPYTERHUB_USER)

diff --git a/config/clusters/opensci/small-binder.values.yaml b/config/clusters/opensci/small-binder.values.yaml
@@ -21,6 +21,7 @@ jupyterhub:
       # Schedule users on the smallest instance
       # https://github.com/2i2c-org/infrastructure/issues/4241
       node.kubernetes.io/instance-type: r5.xlarge
+      2i2c/hub-name: small-binder
     cpu:
       limit: 2
     memory:
@@ -86,6 +87,7 @@ binderhub-service:
       # Schedule dockerApi pods to run on the smallest user nodes only
       # https://github.com/2i2c-org/infrastructure/issues/4241
       node.kubernetes.io/instance-type: r5.xlarge
+      2i2c/hub-name: small-binder
   ingress:
     enabled: true
     hosts: [binder.opensci.2i2c.cloud]
@@ -100,6 +102,7 @@ binderhub-service:
         # Schedule builder pods to run on the smallest user nodes only
         # https://github.com/2i2c-org/infrastructure/issues/4241
         node.kubernetes.io/instance-type: r5.xlarge
+        2i2c/hub-name: small-binder
     BinderHub:
       base_url: /
       hub_url: https://hub.binder.opensci.2i2c.cloud

diff --git a/config/clusters/opensci/staging.values.yaml b/config/clusters/opensci/staging.values.yaml
@@ -28,6 +28,8 @@ jupyterhub:
           name: ""
           url: ""
   singleuser:
+    nodeSelector:
+      2i2c/hub-name: staging
     profileList:
       - display_name: Choose your environment and resources
         slug: only-choice