From 32ff8a76769394f65a48e6ecf2a08972593f5bc0 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Mon, 18 Nov 2024 10:05:36 +0000 Subject: [PATCH 1/3] Remove tainted node from earthscope --- eksctl/earthscope.jsonnet | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/eksctl/earthscope.jsonnet b/eksctl/earthscope.jsonnet index c0a0a912f..0ff252182 100644 --- 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", From 1510d80ec812b8dfce0eb76ad5586893fec1eb57 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Mon, 18 Nov 2024 10:08:23 +0000 Subject: [PATCH 2/3] Remove tainted nodegroup from ubc-eoas --- eksctl/ubc-eoas.jsonnet | 1 - 1 file changed, 1 deletion(-) diff --git a/eksctl/ubc-eoas.jsonnet b/eksctl/ubc-eoas.jsonnet index 8b269f7f5..489b41f0f 100644 --- 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", From 35feede5796d592dfca9912cb1f63e968ee50c0d Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Mon, 18 Nov 2024 10:11:00 +0000 Subject: [PATCH 3/3] Remove tainted nodegroup from opensci --- eksctl/opensci.jsonnet | 2 -- 1 file changed, 2 deletions(-) diff --git a/eksctl/opensci.jsonnet b/eksctl/opensci.jsonnet index 0855c380e..89b27022d 100644 --- 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",