diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml index dda3098ed8..7d30d6fb3d 100644 --- a/config/clusters/nasa-veda/common.values.yaml +++ b/config/clusters/nasa-veda/common.values.yaml @@ -108,8 +108,8 @@ basehub: mem_1_9: display_name: 1.9 GB RAM, upto 3.75 CPUs kubespawner_override: - mem_guarantee: 1992701952 - mem_limit: 1992701952 + mem_guarantee: 1991341312 + mem_limit: 1991341312 cpu_guarantee: 0.234375 cpu_limit: 3.75 node_selector: @@ -118,8 +118,8 @@ basehub: mem_3_7: display_name: 3.7 GB RAM, upto 3.75 CPUs kubespawner_override: - mem_guarantee: 3985403904 - mem_limit: 3985403904 + mem_guarantee: 3982682624 + mem_limit: 3982682624 cpu_guarantee: 0.46875 cpu_limit: 3.75 node_selector: @@ -127,8 +127,8 @@ basehub: mem_7_4: display_name: 7.4 GB RAM, upto 3.75 CPUs kubespawner_override: - mem_guarantee: 7970807808 - mem_limit: 7970807808 + mem_guarantee: 7965365248 + mem_limit: 7965365248 cpu_guarantee: 0.9375 cpu_limit: 3.75 node_selector: @@ -136,8 +136,8 @@ basehub: mem_14_8: display_name: 14.8 GB RAM, upto 3.75 CPUs kubespawner_override: - mem_guarantee: 15941615616 - mem_limit: 15941615616 + mem_guarantee: 15930730496 + mem_limit: 15930730496 cpu_guarantee: 1.875 cpu_limit: 3.75 node_selector: @@ -145,28 +145,29 @@ basehub: mem_29_7: display_name: 29.7 GB RAM, upto 3.75 CPUs kubespawner_override: - mem_guarantee: 31883231232 - mem_limit: 31883231232 + mem_guarantee: 31861460992 + mem_limit: 31861460992 cpu_guarantee: 3.75 cpu_limit: 3.75 node_selector: node.kubernetes.io/instance-type: r5.xlarge - mem_60_6: - display_name: 60.6 GB RAM, upto 15.72 CPUs + + mem_60_7: + display_name: 60.7 GB RAM, upto 15.725 CPUs kubespawner_override: - mem_guarantee: 65105797120 - mem_limit: 65105797120 - cpu_guarantee: 7.86 - cpu_limit: 15.72 + mem_guarantee: 65147242496 + mem_limit: 65147242496 + cpu_guarantee: 7.8625 + cpu_limit: 15.725 node_selector: node.kubernetes.io/instance-type: r5.4xlarge mem_121_3: - display_name: 121.3 GB RAM, upto 15.72 CPUs + display_name: 121.3 GB RAM, upto 15.725 CPUs kubespawner_override: - mem_guarantee: 130211594240 - mem_limit: 130211594240 - cpu_guarantee: 15.72 - cpu_limit: 15.72 + mem_guarantee: 130294484992 + mem_limit: 130294484992 + cpu_guarantee: 15.725 + cpu_limit: 15.725 node_selector: node.kubernetes.io/instance-type: r5.4xlarge - display_name: "Rocker Geospatial with RStudio" diff --git a/deployer/commands/generate/resource_allocation/node-capacity-info.json b/deployer/commands/generate/resource_allocation/node-capacity-info.json index 2566393828..ff153a2f17 100644 --- a/deployer/commands/generate/resource_allocation/node-capacity-info.json +++ b/deployer/commands/generate/resource_allocation/node-capacity-info.json @@ -2,11 +2,11 @@ "r5.xlarge": { "capacity": { "cpu": 4.0, - "memory": 33186611200 + "memory": 33164840960 }, "allocatable": { "cpu": 3.92, - "memory": 32145375232 + "memory": 32123604992 }, "measured_overhead": { "cpu": 0.17, @@ -14,7 +14,7 @@ }, "available": { "cpu": 3.75, - "memory": 31883231232 + "memory": 31861460992 } }, "r5.16xlarge": { @@ -48,19 +48,19 @@ "r5.4xlarge": { "capacity": { "cpu": 16.0, - "memory": 133545017344 + "memory": 133523050496 }, "allocatable": { "cpu": 15.89, - "memory": 130473738240 + "memory": 130451771392 }, "measured_overhead": { - "cpu": 0.17, - "memory": 262144000 + "cpu": 0.165, + "memory": 157286400 }, "available": { - "cpu": 15.72, - "memory": 130211594240 + "cpu": 15.725, + "memory": 130294484992 } }, "n2-highmem-32": {