From 957aedaf67e413fd5c6d79611f50fc8c83660744 Mon Sep 17 00:00:00 2001 From: sarahwilson523 Date: Fri, 11 Jul 2025 09:57:38 -0600 Subject: [PATCH 1/2] Update common.values.yaml Adding clearer descriptions to resource allocation choices, and removing smallest server option for now. --- config/clusters/earthscope/common.values.yaml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/config/clusters/earthscope/common.values.yaml b/config/clusters/earthscope/common.values.yaml index 74f7b5e3d6..a72821fa82 100644 --- a/config/clusters/earthscope/common.values.yaml +++ b/config/clusters/earthscope/common.values.yaml @@ -190,22 +190,22 @@ basehub: resource_allocation: display_name: Resource Allocation choices: - mem_3_7: - display_name: 3.7 GB RAM, upto 3.7 CPUs - default: true - allowed_groups: - - geolab - - geolab:dev - - geolab:power - kubespawner_override: - mem_guarantee: 3982489550 - mem_limit: 3982489550 - cpu_guarantee: 0.465625 - cpu_limit: 3.725 - node_selector: - node.kubernetes.io/instance-type: r5.xlarge + # mem_3_7: + # display_name: Try It: 3.7 GB RAM, >= 0.5 CPU + # default: true + # allowed_groups: + # - geolab + # - geolab:dev + # - geolab:power + # kubespawner_override: + # mem_guarantee: 3982489550 + # mem_limit: 3982489550 + # cpu_guarantee: 0.465625 + # cpu_limit: 3.725 + # node_selector: + # node.kubernetes.io/instance-type: r5.xlarge mem_7_4: - display_name: 7.4 GB RAM, upto 3.7 CPUs + display_name: Light Workload: 7.4 GB RAM, >= 1 CPU allowed_groups: - geolab - geolab:dev @@ -218,7 +218,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.xlarge mem_14_8: - display_name: 14.8 GB RAM, upto 3.7 CPUs + display_name: Moderate Workload: 14.8 GB RAM, >= 2 CPUs allowed_groups: - geolab - geolab:dev @@ -231,7 +231,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.xlarge mem_29_7: - display_name: 29.7 GB RAM, upto 3.7 CPUs + display_name: Standard Workload: 30 GB RAM, 4 CPUs allowed_groups: - geolab - geolab:dev @@ -244,7 +244,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.xlarge mem_60_6: - display_name: 60.6 GB RAM, upto 15.6 CPUs + display_name: Heavy Workload: 60 GB RAM, >= 8 CPUs allowed_groups: - geolab:dev - geolab:power @@ -256,7 +256,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.4xlarge mem_121_2: - display_name: 121.2 GB RAM, upto 15.6 CPUs + display_name: Mega Workload: 120 GB RAM, 16 CPUs allowed_groups: - geolab:dev - geolab:power @@ -268,7 +268,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.4xlarge mem_489_9: - display_name: 489.9 GB RAM, upto 63.5 CPUs + display_name: Extreme Workload: 490 GB RAM, 64 CPUs allowed_groups: - geolab:power kubespawner_override: From f016bbac7cb362803721d9ffab62ad2296c81b40 Mon Sep 17 00:00:00 2001 From: sarahwilson523 Date: Mon, 14 Jul 2025 12:13:38 -0600 Subject: [PATCH 2/2] Update common.values.yaml changed : to - --- config/clusters/earthscope/common.values.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/clusters/earthscope/common.values.yaml b/config/clusters/earthscope/common.values.yaml index a72821fa82..cf37b5bd60 100644 --- a/config/clusters/earthscope/common.values.yaml +++ b/config/clusters/earthscope/common.values.yaml @@ -191,7 +191,7 @@ basehub: display_name: Resource Allocation choices: # mem_3_7: - # display_name: Try It: 3.7 GB RAM, >= 0.5 CPU + # display_name: Try It - 3.7 GB RAM, >= 0.5 CPU # default: true # allowed_groups: # - geolab @@ -205,7 +205,7 @@ basehub: # node_selector: # node.kubernetes.io/instance-type: r5.xlarge mem_7_4: - display_name: Light Workload: 7.4 GB RAM, >= 1 CPU + display_name: Light Workload - 7.4 GB RAM, >= 1 CPU allowed_groups: - geolab - geolab:dev @@ -218,7 +218,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.xlarge mem_14_8: - display_name: Moderate Workload: 14.8 GB RAM, >= 2 CPUs + display_name: Moderate Workload - 14.8 GB RAM, >= 2 CPUs allowed_groups: - geolab - geolab:dev @@ -231,7 +231,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.xlarge mem_29_7: - display_name: Standard Workload: 30 GB RAM, 4 CPUs + display_name: Standard Workload - 30 GB RAM, 4 CPUs allowed_groups: - geolab - geolab:dev @@ -244,7 +244,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.xlarge mem_60_6: - display_name: Heavy Workload: 60 GB RAM, >= 8 CPUs + display_name: Heavy Workload - 60 GB RAM, >= 8 CPUs allowed_groups: - geolab:dev - geolab:power @@ -256,7 +256,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.4xlarge mem_121_2: - display_name: Mega Workload: 120 GB RAM, 16 CPUs + display_name: Mega Workload - 120 GB RAM, 16 CPUs allowed_groups: - geolab:dev - geolab:power @@ -268,7 +268,7 @@ basehub: node_selector: node.kubernetes.io/instance-type: r5.4xlarge mem_489_9: - display_name: Extreme Workload: 490 GB RAM, 64 CPUs + display_name: Extreme Workload - 490 GB RAM, 64 CPUs allowed_groups: - geolab:power kubespawner_override: