Merge pull request #5441 from sgibson91/decomm-ncar-cisl

Decommission NCAR-CISL hub
2i2c-org · Jan 28, 2025 · 51aeec4 · 51aeec4
2 parents 86013d3 + 5fa92c7
commit 51aeec4
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 337 deletions.
diff --git a/config/clusters/2i2c-aws-us/cluster.yaml b/config/clusters/2i2c-aws-us/cluster.yaml
@@ -36,14 +36,6 @@ hubs:
       - daskhub-common.values.yaml
       - showcase.values.yaml
       - enc-showcase.secret.values.yaml
-  - name: ncar-cisl
-    display_name: "NCAR-CISL for UCAR"
-    domain: ncar-cisl.2i2c.cloud
-    helm_chart: daskhub
-    helm_chart_values_files:
-      - daskhub-common.values.yaml
-      - ncar-cisl.values.yaml
-      - enc-ncar-cisl.secret.values.yaml
   - name: cosmicds
     display_name: "Cosmic DS"
     domain: cosmicds.2i2c.cloud

diff --git a/config/clusters/2i2c-aws-us/enc-ncar-cisl.secret.values.yaml b/config/clusters/2i2c-aws-us/enc-ncar-cisl.secret.values.yaml
diff --git a/config/clusters/2i2c-aws-us/ncar-cisl.values.yaml b/config/clusters/2i2c-aws-us/ncar-cisl.values.yaml
diff --git a/eksctl/2i2c-aws-us.jsonnet b/eksctl/2i2c-aws-us.jsonnet
@@ -98,41 +98,6 @@ local notebookNodes = [
         // GPUs in a single AZ are in use and no new nodes can be spawned
         availabilityZones: masterAzs,
     },
-    // ncar-cisl
-    {
-        instanceType: "r5.xlarge",
-        namePrefix: "nb-ncar-cisl",
-        labels+: { "2i2c/hub-name": "ncar-cisl" },
-        tags+: { "2i2c:hub-name": "ncar-cisl" }
-    },
-    {
-        instanceType: "r5.4xlarge",
-        namePrefix: "nb-ncar-cisl",
-        labels+: { "2i2c/hub-name": "ncar-cisl" },
-        tags+: { "2i2c:hub-name": "ncar-cisl" }
-    },
-    {
-        instanceType: "r5.16xlarge",
-        namePrefix: "nb-ncar-cisl",
-        labels+: { "2i2c/hub-name": "ncar-cisl" },
-        tags+: { "2i2c:hub-name": "ncar-cisl" }
-    },
-    {
-        instanceType: "g4dn.xlarge",
-        namePrefix: "gpu-ncar-cisl",
-        minSize: 0,
-        labels+: { "2i2c/hub-name": "ncar-cisl" },
-        tags+: {
-            "k8s.io/cluster-autoscaler/node-template/resources/nvidia.com/gpu": "1",
-            "2i2c:hub-name": "ncar-cisl",
-        },
-        taints+: {
-            "nvidia.com/gpu": "present:NoSchedule"
-        },
-        // Allow provisioning GPUs across all AZs, to prevent situation where all
-        // GPUs in a single AZ are in use and no new nodes can be spawned
-        availabilityZones: masterAzs,
-    },
     // cosmicds
     {
         instanceType: "r5.xlarge",

diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars
@@ -22,10 +22,6 @@ user_buckets = {
     "delete_after" : null,
     "tags" : { "2i2c:hub-name" : "showcase" },
   },
-  "scratch-ncar-cisl" : {
-    "delete_after" : 7,
-    "tags" : { "2i2c:hub-name" : "ncar-cisl" },
-  },
 }
 
 hub_cloud_permissions = {
@@ -41,7 +37,4 @@ hub_cloud_permissions = {
       "persistent-showcase",
     ],
   },
-  "ncar-cisl" : {
-    bucket_admin_access : ["scratch-ncar-cisl"],
-  },
 }