From 4aed8a58cd8fe676f6f3bd1f64a6cae16bee3c09 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 15 Nov 2024 15:08:12 +0200 Subject: [PATCH 1/2] Add missing prefix --- eksctl/2i2c-aws-us.jsonnet | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eksctl/2i2c-aws-us.jsonnet b/eksctl/2i2c-aws-us.jsonnet index 8326b152e..c2c985243 100644 --- a/eksctl/2i2c-aws-us.jsonnet +++ b/eksctl/2i2c-aws-us.jsonnet @@ -136,38 +136,38 @@ local notebookNodes = [ // itcoocean { instanceType: "r5.xlarge", - namePrefix: "itcoocean", + namePrefix: "nb-itcoocean", labels+: { "2i2c/hub-name": "itcoocean" }, tags+: { "2i2c:hub-name": "itcoocean" } }, { instanceType: "r5.4xlarge", - namePrefix: "itcoocean", + namePrefix: "nb-itcoocean", labels+: { "2i2c/hub-name": "itcoocean" }, tags+: { "2i2c:hub-name": "itcoocean" } }, { instanceType: "r5.16xlarge", - namePrefix: "itcoocean", + namePrefix: "nb-itcoocean", labels+: { "2i2c/hub-name": "itcoocean" }, tags+: { "2i2c:hub-name": "itcoocean" } }, // cosmicds { instanceType: "r5.xlarge", - namePrefix: "cosmicds", + namePrefix: "nb-cosmicds", labels+: { "2i2c/hub-name": "cosmicds" }, tags+: { "2i2c:hub-name": "cosmicds" } }, { instanceType: "r5.4xlarge", - namePrefix: "cosmicds", + namePrefix: "nb-cosmicds", labels+: { "2i2c/hub-name": "cosmicds" }, tags+: { "2i2c:hub-name": "cosmicds" } }, { instanceType: "r5.16xlarge", - namePrefix: "cosmicds", + namePrefix: "nb-cosmicds", labels+: { "2i2c/hub-name": "cosmicds" }, tags+: { "2i2c:hub-name": "cosmicds" } }, @@ -186,7 +186,7 @@ local daskNodes = [ // node pool, see https://github.com/2i2c-org/infrastructure/issues/2687. // { - namePrefix: "dask-staging", + namePrefix: "dask-dask-staging", labels+: { "2i2c/hub-name": "dask-staging" }, tags+: { "2i2c:hub-name": "dask-staging" }, instancesDistribution+: { instanceTypes: ["r5.4xlarge"] } From 04d8a08943b2d1870260fce1f628d56ea705cd86 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 15 Nov 2024 15:08:32 +0200 Subject: [PATCH 2/2] Default to smallest instance type --- config/clusters/2i2c-aws-us/cosmicds.values.yaml | 1 + config/clusters/2i2c-aws-us/staging.values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/clusters/2i2c-aws-us/cosmicds.values.yaml b/config/clusters/2i2c-aws-us/cosmicds.values.yaml index 38d384c04..a97889f10 100644 --- a/config/clusters/2i2c-aws-us/cosmicds.values.yaml +++ b/config/clusters/2i2c-aws-us/cosmicds.values.yaml @@ -40,6 +40,7 @@ jupyterhub: singleuser: nodeSelector: 2i2c/hub-name: cosmicds + node.kubernetes.io/instance-type: r5.xlarge # No persistent storage should be kept to reduce any potential data # retention & privacy issues. # Ref https://github.com/2i2c-org/infrastructure/issues/2128#issuecomment-1635107926 diff --git a/config/clusters/2i2c-aws-us/staging.values.yaml b/config/clusters/2i2c-aws-us/staging.values.yaml index 2f9c93d5d..cff38ff1d 100644 --- a/config/clusters/2i2c-aws-us/staging.values.yaml +++ b/config/clusters/2i2c-aws-us/staging.values.yaml @@ -35,5 +35,6 @@ jupyterhub: singleuser: nodeSelector: 2i2c/hub-name: staging + node.kubernetes.io/instance-type: r5.xlarge extraEnv: SCRATCH_BUCKET: s3://2i2c-aws-us-scratch-staging/$(JUPYTERHUB_USER)