Skip to content

Commit 36e8f4b

Browse files
committed
Deploy clearer resource allocation labels to earthscope
Based on conversation in 2i2c-org#6351 Regenerated based on 2i2c-org#6313
1 parent 5c1b3ab commit 36e8f4b

File tree

1 file changed

+49
-43
lines changed

1 file changed

+49
-43
lines changed

config/clusters/earthscope/common.values.yaml

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -190,92 +190,98 @@ basehub:
190190
resource_allocation:
191191
display_name: Resource Allocation
192192
choices:
193-
mem_3_7:
194-
display_name: 3.7 GB RAM, upto 3.7 CPUs
195-
default: true
193+
mem_4_gb:
194+
display_name: 4 GB RAM, ~0.5 CPUs
195+
description: Upto ~4 CPUs when available
196196
allowed_groups:
197197
- geolab
198198
- geolab:dev
199199
- geolab:power
200200
kubespawner_override:
201-
mem_guarantee: 3982489550
202-
mem_limit: 3982489550
203-
cpu_guarantee: 0.465625
204-
cpu_limit: 3.725
201+
mem_guarantee: 3902839759
202+
mem_limit: 3902839759
203+
cpu_guarantee: 0.4563125
204+
cpu_limit: 3.6505
205205
node_selector:
206206
node.kubernetes.io/instance-type: r5.xlarge
207-
mem_7_4:
208-
display_name: 7.4 GB RAM, upto 3.7 CPUs
207+
mem_7_gb:
208+
display_name: 7 GB RAM, ~0.9 CPUs
209+
description: Upto ~4 CPUs when available
209210
allowed_groups:
210211
- geolab
211212
- geolab:dev
212213
- geolab:power
213214
kubespawner_override:
214-
mem_guarantee: 7964979101
215-
mem_limit: 7964979101
216-
cpu_guarantee: 0.93125
217-
cpu_limit: 3.725
215+
mem_guarantee: 7805679519
216+
mem_limit: 7805679519
217+
cpu_guarantee: 0.912625
218+
cpu_limit: 3.6505
218219
node_selector:
219220
node.kubernetes.io/instance-type: r5.xlarge
220-
mem_14_8:
221-
display_name: 14.8 GB RAM, upto 3.7 CPUs
221+
mem_15_gb:
222+
display_name: 15 GB RAM, ~1.8 CPUs
223+
description: Upto ~4 CPUs when available
222224
allowed_groups:
223225
- geolab
224226
- geolab:dev
225227
- geolab:power
226228
kubespawner_override:
227-
mem_guarantee: 15929958203
228-
mem_limit: 15929958203
229-
cpu_guarantee: 1.8625
230-
cpu_limit: 3.725
229+
mem_guarantee: 15611359038
230+
mem_limit: 15611359038
231+
cpu_guarantee: 1.82525
232+
cpu_limit: 3.6505
231233
node_selector:
232234
node.kubernetes.io/instance-type: r5.xlarge
233-
mem_29_7:
234-
display_name: 29.7 GB RAM, upto 3.7 CPUs
235+
mem_29_gb:
236+
display_name: 29 GB RAM, ~4 CPUs
237+
description: ~4 CPUs always available
235238
allowed_groups:
236239
- geolab
237240
- geolab:dev
238241
- geolab:power
239242
kubespawner_override:
240-
mem_guarantee: 31859916406
241-
mem_limit: 31859916406
242-
cpu_guarantee: 3.725
243-
cpu_limit: 3.725
243+
mem_guarantee: 31222718077
244+
mem_limit: 31222718077
245+
cpu_guarantee: 3.6505
246+
cpu_limit: 3.6505
244247
node_selector:
245248
node.kubernetes.io/instance-type: r5.xlarge
246-
mem_60_6:
247-
display_name: 60.6 GB RAM, upto 15.6 CPUs
249+
mem_60_gb:
250+
display_name: 60 GB RAM, ~8 CPUs
251+
description: Upto ~15 CPUs when available
248252
allowed_groups:
249253
- geolab:dev
250254
- geolab:power
251255
kubespawner_override:
252-
mem_guarantee: 65094448840
253-
mem_limit: 65094448840
254-
cpu_guarantee: 7.8475
255-
cpu_limit: 15.695
256+
mem_guarantee: 64020707016
257+
mem_limit: 64020707016
258+
cpu_guarantee: 7.69055
259+
cpu_limit: 15.3811
256260
node_selector:
257261
node.kubernetes.io/instance-type: r5.4xlarge
258-
mem_121_2:
259-
display_name: 121.2 GB RAM, upto 15.6 CPUs
262+
mem_119_gb:
263+
display_name: 119 GB RAM, ~15 CPUs
264+
description: ~15 CPUs always available
260265
allowed_groups:
261266
- geolab:dev
262267
- geolab:power
263268
kubespawner_override:
264-
mem_guarantee: 130188897681
265-
mem_limit: 130188897681
266-
cpu_guarantee: 15.695
267-
cpu_limit: 15.695
269+
mem_guarantee: 128041414033
270+
mem_limit: 128041414033
271+
cpu_guarantee: 15.3811
272+
cpu_limit: 15.3811
268273
node_selector:
269274
node.kubernetes.io/instance-type: r5.4xlarge
270-
mem_489_9:
271-
display_name: 489.9 GB RAM, upto 63.5 CPUs
275+
mem_488_gb:
276+
display_name: 488 GB RAM, ~63 CPUs
277+
description: ~63 CPUs always available
272278
allowed_groups:
273279
- geolab:power
274280
kubespawner_override:
275-
mem_guarantee: 525987313876
276-
mem_limit: 525987313876
277-
cpu_guarantee: 63.575
278-
cpu_limit: 63.575
281+
mem_guarantee: 523839830228
282+
mem_limit: 523839830228
283+
cpu_guarantee: 62.575
284+
cpu_limit: 62.575
279285
node_selector:
280286
node.kubernetes.io/instance-type: r5.16xlarge
281287
scheduling:

0 commit comments

Comments
 (0)