From dba818894f171ffc98b5fe79670b51acd96952f6 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 20 Nov 2024 14:55:11 +0200 Subject: [PATCH 1/2] earthscope: tag dask nodes with a purpose tag --- eksctl/earthscope.jsonnet | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eksctl/earthscope.jsonnet b/eksctl/earthscope.jsonnet index a9b0340f4c..734e0e8fd6 100644 --- a/eksctl/earthscope.jsonnet +++ b/eksctl/earthscope.jsonnet @@ -235,6 +235,9 @@ local daskNodes = [ "k8s.dask.org_dedicated" : "worker:NoSchedule", "k8s.dask.org/dedicated" : "worker:NoSchedule" }, + tags+: { + "2i2c:node-purpose": "worker" + }, instancesDistribution+: { onDemandBaseCapacity: 0, onDemandPercentageAboveBaseCapacity: 0, From 160b11fbfae7b56f33f555a864279764b2d53f9b Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 20 Nov 2024 15:00:10 +0200 Subject: [PATCH 2/2] earthscope: put dask workers into a nodepool per hub --- eksctl/earthscope.jsonnet | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/eksctl/earthscope.jsonnet b/eksctl/earthscope.jsonnet index 734e0e8fd6..48440dc09f 100644 --- a/eksctl/earthscope.jsonnet +++ b/eksctl/earthscope.jsonnet @@ -98,12 +98,25 @@ local daskNodes = [ // A not yet fully established policy is being developed about using a single // node pool, see https://github.com/2i2c-org/infrastructure/issues/2687. // - { - instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }, + { + namePrefix: "dask-staging", + labels+: { "2i2c/hub-name": "staging" }, tags+: { + "2i2c:hub-name": "staging", + "earthscope:application:name": "geolab", + "earthscope:application:owner": "research-onramp-to-the-cloud" + }, + instancesDistribution+: { instanceTypes: ["r5.4xlarge"] } + }, + { + namePrefix: "dask-prod", + labels+: { "2i2c/hub-name": "prod" }, + tags+: { + "2i2c:hub-name": "prod", "earthscope:application:name": "geolab", "earthscope:application:owner": "research-onramp-to-the-cloud" }, + instancesDistribution+: { instanceTypes: ["r5.4xlarge"] } }, ];