diff --git a/config/clusters/jupyter-meets-the-earth/prod.values.yaml b/config/clusters/jupyter-meets-the-earth/prod.values.yaml index b46b6aee1..940a1220e 100644 --- a/config/clusters/jupyter-meets-the-earth/prod.values.yaml +++ b/config/clusters/jupyter-meets-the-earth/prod.values.yaml @@ -32,3 +32,13 @@ basehub: nodeSelector: 2i2c/hub-name: prod node.kubernetes.io/instance-type: m5.xlarge +dask-gateway: + gateway: + scheduler: + extraPodConfig: + nodeSelector: + 2i2c/hub-name: prod + worker: + extraPodConfig: + nodeSelector: + 2i2c/hub-name: prod diff --git a/config/clusters/jupyter-meets-the-earth/staging.values.yaml b/config/clusters/jupyter-meets-the-earth/staging.values.yaml index de1f9531e..8e54b0fad 100644 --- a/config/clusters/jupyter-meets-the-earth/staging.values.yaml +++ b/config/clusters/jupyter-meets-the-earth/staging.values.yaml @@ -17,3 +17,13 @@ basehub: 2i2c/hub-name: staging extraEnv: SCRATCH_BUCKET: s3://jupyter-meets-the-earth-scratch-staging/$(JUPYTERHUB_USER) +dask-gateway: + gateway: + scheduler: + extraPodConfig: + nodeSelector: + 2i2c/hub-name: staging + worker: + extraPodConfig: + nodeSelector: + 2i2c/hub-name: staging diff --git a/eksctl/jupyter-meets-the-earth.jsonnet b/eksctl/jupyter-meets-the-earth.jsonnet index 41186f4b4..a8f9c3f24 100644 --- a/eksctl/jupyter-meets-the-earth.jsonnet +++ b/eksctl/jupyter-meets-the-earth.jsonnet @@ -199,7 +199,18 @@ 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" }, + instancesDistribution+: { instanceTypes: ["r5.4xlarge"] } + }, + { + namePrefix: "dask-prod", + labels+: { "2i2c/hub-name": "prod" }, + tags+: { "2i2c:hub-name": "prod" }, + instancesDistribution+: { instanceTypes: ["r5.4xlarge"] } + }, ]; @@ -320,6 +331,9 @@ local daskNodes = [ labels+: { "k8s.dask.org/node-purpose": "worker" }, + tags+: { + "k8s.dask.org/node-purpose": "worker" + }, taints+: { "k8s.dask.org_dedicated" : "worker:NoSchedule", "k8s.dask.org/dedicated" : "worker:NoSchedule"