Merge pull request #525 from yuvipanda/carbonplan-bump

Make carbonplan cluster more resilient
2i2c-org · Jul 20, 2021 · 086b256 · 086b256
2 parents 474d702 + ab49a7f
commit 086b256
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 22 deletions.
diff --git a/config/hubs/carbonplan.cluster.yaml b/config/hubs/carbonplan.cluster.yaml
@@ -118,16 +118,37 @@ hubs:
             https:
               enabled: true
             chp:
+              resources:
+                requests:
+                  cpu: 0.5
+                  memory: 256Mi
+                limits:
+                  cpu: 1
+                  memory: 4Gi
               nodeSelector: {}
               tolerations:
                 - key:  "node-role.kubernetes.io/master"
                   effect: "NoSchedule"
             traefik:
+              resources:
+                requests:
+                  cpu: 0.5
+                  memory: 256Mi
+                limits:
+                  cpu: 1
+                  memory: 4Gi
               nodeSelector: {}
               tolerations:
                 - key:  "node-role.kubernetes.io/master"
                   effect: "NoSchedule"
           hub:
+            resources:
+              requests:
+                cpu: 0.5
+                memory: 256Mi
+              limits:
+                cpu: 1
+                memory: 4Gi
             allowNamedServers: true
             networkPolicy:
               # FIXME: For dask gateway
@@ -143,11 +164,32 @@ hubs:
           tolerations:
             - key:  "node-role.kubernetes.io/master"
               effect: "NoSchedule"
+          resources:
+            requests:
+              cpu: 0.5
+              memory: 512Mi
+            limits:
+              cpu: 2
+              memory: 4Gi
         controller:
           tolerations:
             - key:  "node-role.kubernetes.io/master"
               effect: "NoSchedule"
+          resources:
+            requests:
+              cpu: 0.5
+              memory: 512Mi
+            limits:
+              cpu: 2
+              memory: 4Gi
         gateway:
+          resources:
+            requests:
+              cpu: 0.5
+              memory: 512Mi
+            limits:
+              cpu: 2
+              memory: 4Gi
           tolerations:
             - key:  "node-role.kubernetes.io/master"
               effect: "NoSchedule"

diff --git a/kops/carbonplan.jsonnet b/kops/carbonplan.jsonnet
@@ -33,15 +33,15 @@ local data = {
             name: "master"
         },
         spec+: {
-            machineType: "t3.medium",
+            machineType: "m5.2xlarge",
             subnets: [zone],
             nodeLabels+: {
                 "hub.jupyter.org/node-purpose": "core",
                 "k8s.dask.org/node-purpose": "core"
             },
-            // Needs to be at least 1
-            minSize: 1,
-            maxSize: 3,
+            // CarbonPlan runs big jobs, so let's be resilient here
+            minSize: 3,
+            maxSize: 6,
             role: "Master"
         },
     },
@@ -57,7 +57,7 @@ local data = {
             spec+: {
                 machineType: n.machineType,
                 subnets: [zone],
-                maxSize: 20,
+                maxSize: 500,
                 role: "Node",
                 nodeLabels+: {
                     "hub.jupyter.org/node-purpose": "user",
@@ -82,7 +82,7 @@ local data = {
             spec+: {
                 machineType: n.machineType,
                 subnets: [zone],
-                maxSize: 20,
+                maxSize: 500,
                 role: "Node",
                 nodeLabels+: {
                     "k8s.dask.org/node-purpose": "worker"