Merge pull request #5126 from sgibson91/cleanup-tainted-nodes

Cleanup tainted nodegroups
2i2c-org · Nov 18, 2024 · 4c521cd · 4c521cd
2 parents e2e4abd + 35feede
commit 4c521cd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/eksctl/earthscope.jsonnet b/eksctl/earthscope.jsonnet
@@ -25,17 +25,6 @@ local nodeAz = "us-east-2a";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
-    // FIXME: tainted, to be deleted when empty, replaced by equivalent
-    {
-        instanceType: "r5.xlarge",
-        namePrefix: "nb-staging",
-        labels+: { "2i2c/hub-name": "staging" },
-        tags+: {
-            "2i2c:hub-name": "staging",
-            "earthscope:application:name": "geolab",
-            "earthscope:application:owner": "research-onramp-to-the-cloud"
-        },
-    },
     {
         instanceType: "r5.xlarge",
         namePrefix: "nb-staging",

diff --git a/eksctl/opensci.jsonnet b/eksctl/opensci.jsonnet
@@ -25,8 +25,6 @@ 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 = [
-    // FIXME: tainted, to be deleted when empty, replaced by equivalent
-    { instanceType: "r5.xlarge" },
     // staging hub
     {
         instanceType: "r5.xlarge",

diff --git a/eksctl/ubc-eoas.jsonnet b/eksctl/ubc-eoas.jsonnet
@@ -25,7 +25,6 @@ local nodeAz = "ca-central-1a";
 // 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.2xlarge" }, // FIXME: tainted, to be deleted when empty, replaced by equivalent during k8s upgrade
     {
         instanceType: "r5.xlarge",
         namePrefix: "nb-staging",