From 2dda0ec31ec2e4b5294f41aa3a2faeed80528ffd Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 18 Dec 2023 19:07:29 -0800
Subject: [PATCH] Don't give temple its own nodepool

They never have had more than 20 users on at the same time
in a while, and the huge dedicated node is costing them a lot
more than needed.
---
 config/clusters/2i2c/temple.values.yaml  |  7 -------
 terraform/gcp/projects/pilot-hubs.tfvars | 21 ---------------------
 2 files changed, 28 deletions(-)

diff --git a/config/clusters/2i2c/temple.values.yaml b/config/clusters/2i2c/temple.values.yaml
index b62d10f4bd..94248c7fa5 100644
--- a/config/clusters/2i2c/temple.values.yaml
+++ b/config/clusters/2i2c/temple.values.yaml
@@ -26,13 +26,6 @@ jupyterhub:
           name: Temple University
           url: https://www.temple.edu/
   singleuser:
-    nodeSelector:
-      2i2c.org/community: temple
-    extraTolerations:
-      - key: "2i2c.org/community"
-        operator: "Equal"
-        value: "temple"
-        effect: "NoSchedule"
     memory:
       # Memory defaults are 256MB to 1G in basehub. These are bumped based on a
       # request to bump these (https://2i2c.freshdesk.com/a/tickets/1003) at
diff --git a/terraform/gcp/projects/pilot-hubs.tfvars b/terraform/gcp/projects/pilot-hubs.tfvars
index 0ec2091301..7b88aca98b 100644
--- a/terraform/gcp/projects/pilot-hubs.tfvars
+++ b/terraform/gcp/projects/pilot-hubs.tfvars
@@ -34,27 +34,6 @@ notebook_nodes = {
     max : 100,
     machine_type : "n2-highmem-64",
   },
-  # Nodepool for temple university. https://github.com/2i2c-org/infrastructure/issues/3158
-  "temple-b" : {
-    # Expecting upto ~120 users at a time
-    min : 0,
-    max : 100,
-    # Everyone gets a 256M guarantee, and n2-highmem-8 has about 60GB of RAM.
-    # This fits upto 100 users on the node, as memory guarantee isn't the constraint.
-    # This works ok.
-    machine_type : "n2-highmem-8",
-    labels : {
-      "2i2c.org/community" : "temple"
-    },
-    taints : [{
-      key : "2i2c.org/community",
-      value : "temple",
-      effect : "NO_SCHEDULE"
-    }],
-    resource_labels : {
-      "community" : "temple"
-    },
-  },
   "agu-binder" : {
     min : 0,
     max : 100,