Skip to content

Commit 789ed8e

Browse files
authored
feat: add custom labels (#340)
1 parent 00902be commit 789ed8e

File tree

13 files changed

+129
-0
lines changed

13 files changed

+129
-0
lines changed

src/cl/lighthouse/lighthouse_launcher.star

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ def launch(
165165
image,
166166
log_level,
167167
beacon_http_url,
168+
el_client_context,
168169
node_keystore_files,
169170
v_min_cpu,
170171
v_max_cpu,
@@ -341,6 +342,12 @@ def get_beacon_config(
341342
max_cpu=bn_max_cpu,
342343
min_memory=bn_min_mem,
343344
max_memory=bn_max_mem,
345+
labels=shared_utils.label_maker(
346+
constants.CL_CLIENT_TYPE.lighthouse,
347+
constants.CLIENT_TYPES.cl,
348+
image,
349+
el_client_context.client_name,
350+
),
344351
)
345352

346353

@@ -349,6 +356,7 @@ def get_validator_config(
349356
image,
350357
log_level,
351358
beacon_client_http_url,
359+
el_client_context,
352360
node_keystore_files,
353361
v_min_cpu,
354362
v_max_cpu,
@@ -407,6 +415,12 @@ def get_validator_config(
407415
max_cpu=v_max_cpu,
408416
min_memory=v_min_mem,
409417
max_memory=v_max_mem,
418+
labels=shared_utils.label_maker(
419+
constants.CL_CLIENT_TYPE.lighthouse,
420+
constants.CLIENT_TYPES.validator,
421+
image,
422+
el_client_context.client_name,
423+
),
410424
)
411425

412426

src/cl/lodestar/lodestar_launcher.star

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ def launch(
141141
image,
142142
log_level,
143143
beacon_http_url,
144+
el_client_context,
144145
node_keystore_files,
145146
v_min_cpu,
146147
v_max_cpu,
@@ -286,6 +287,12 @@ def get_beacon_config(
286287
max_cpu=bn_max_cpu,
287288
min_memory=bn_min_mem,
288289
max_memory=bn_max_mem,
290+
labels=shared_utils.label_maker(
291+
constants.CL_CLIENT_TYPE.lodestar,
292+
constants.CLIENT_TYPES.cl,
293+
image,
294+
el_client_context.client_name,
295+
),
289296
)
290297

291298

@@ -295,6 +302,7 @@ def get_validator_config(
295302
image,
296303
log_level,
297304
beacon_client_http_url,
305+
el_client_context,
298306
node_keystore_files,
299307
v_min_cpu,
300308
v_max_cpu,
@@ -351,6 +359,12 @@ def get_validator_config(
351359
max_cpu=v_max_cpu,
352360
min_memory=v_min_mem,
353361
max_memory=v_max_mem,
362+
labels=shared_utils.label_maker(
363+
constants.CL_CLIENT_TYPE.lodestar,
364+
constants.CLIENT_TYPES.validator,
365+
image,
366+
el_client_context.client_name,
367+
),
354368
)
355369

356370

src/cl/nimbus/nimbus_launcher.star

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,12 @@ def get_config(
315315
max_cpu=bn_max_cpu,
316316
min_memory=bn_min_mem,
317317
max_memory=bn_max_mem,
318+
labels=shared_utils.label_maker(
319+
constants.CL_CLIENT_TYPE.nimbus,
320+
constants.CLIENT_TYPES.cl,
321+
image,
322+
el_client_context.client_name,
323+
),
318324
)
319325

320326

src/cl/prysm/prysm_launcher.star

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def launch(
169169
log_level,
170170
beacon_rpc_endpoint,
171171
beacon_http_endpoint,
172+
el_client_context,
172173
node_keystore_files,
173174
v_min_cpu,
174175
v_max_cpu,
@@ -315,6 +316,12 @@ def get_beacon_config(
315316
max_cpu=bn_max_cpu,
316317
min_memory=bn_min_mem,
317318
max_memory=bn_max_mem,
319+
labels=shared_utils.label_maker(
320+
constants.CL_CLIENT_TYPE.prysm,
321+
constants.CLIENT_TYPES.cl,
322+
beacon_image,
323+
el_client_context.client_name,
324+
),
318325
)
319326

320327

@@ -325,6 +332,7 @@ def get_validator_config(
325332
log_level,
326333
beacon_rpc_endpoint,
327334
beacon_http_endpoint,
335+
el_client_context,
328336
node_keystore_files,
329337
v_min_cpu,
330338
v_max_cpu,
@@ -382,6 +390,12 @@ def get_validator_config(
382390
max_cpu=v_max_cpu,
383391
min_memory=v_min_mem,
384392
max_memory=v_max_mem,
393+
labels=shared_utils.label_maker(
394+
constants.CL_CLIENT_TYPE.prysm,
395+
constants.CLIENT_TYPES.validator,
396+
validator_image,
397+
el_client_context.client_name,
398+
),
385399
)
386400

387401

src/cl/teku/teku_launcher.star

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,12 @@ def get_config(
320320
max_cpu=bn_max_cpu,
321321
min_memory=bn_min_mem,
322322
max_memory=bn_max_mem,
323+
labels=shared_utils.label_maker(
324+
constants.CL_CLIENT_TYPE.teku,
325+
constants.CLIENT_TYPES.cl,
326+
image,
327+
el_client_context.client_name,
328+
),
323329
)
324330

325331

src/el/besu/besu_launcher.star

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,14 @@ def launch(
8484
el_min_mem = int(el_min_mem) if int(el_min_mem) > 0 else EXECUTION_MIN_MEMORY
8585
el_max_mem = int(el_max_mem) if int(el_max_mem) > 0 else EXECUTION_MAX_MEMORY
8686

87+
cl_client_name = service_name.split("-")[3]
88+
8789
config = get_config(
8890
launcher.network_id,
8991
launcher.el_cl_genesis_data,
9092
image,
9193
existing_el_clients,
94+
cl_client_name,
9295
log_level,
9396
el_min_cpu,
9497
el_max_cpu,
@@ -125,6 +128,7 @@ def get_config(
125128
el_cl_genesis_data,
126129
image,
127130
existing_el_clients,
131+
cl_client_name,
128132
log_level,
129133
el_min_cpu,
130134
el_max_cpu,
@@ -197,6 +201,12 @@ def get_config(
197201
min_memory=el_min_mem,
198202
max_memory=el_max_mem,
199203
env_vars=extra_env_vars,
204+
labels=shared_utils.label_maker(
205+
constants.EL_CLIENT_TYPE.besu,
206+
constants.CLIENT_TYPES.el,
207+
image,
208+
cl_client_name,
209+
),
200210
)
201211

202212

src/el/erigon/erigon_launcher.star

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,14 @@ def launch(
8585
el_min_mem = el_min_mem if int(el_min_mem) > 0 else EXECUTION_MIN_MEMORY
8686
el_max_mem = el_max_mem if int(el_max_mem) > 0 else EXECUTION_MAX_MEMORY
8787

88+
cl_client_name = service_name.split("-")[3]
89+
8890
config = get_config(
8991
launcher.network_id,
9092
launcher.el_cl_genesis_data,
9193
image,
9294
existing_el_clients,
95+
cl_client_name,
9396
log_level,
9497
el_min_cpu,
9598
el_max_cpu,
@@ -128,6 +131,7 @@ def get_config(
128131
el_cl_genesis_data,
129132
image,
130133
existing_el_clients,
134+
cl_client_name,
131135
verbosity_level,
132136
el_min_cpu,
133137
el_max_cpu,
@@ -209,6 +213,12 @@ def get_config(
209213
min_memory=el_min_mem,
210214
max_memory=el_max_mem,
211215
env_vars=extra_env_vars,
216+
labels=shared_utils.label_maker(
217+
constants.EL_CLIENT_TYPE.erigon,
218+
constants.CLIENT_TYPES.el,
219+
image,
220+
cl_client_name,
221+
),
212222
)
213223

214224

src/el/ethereumjs/ethereumjs_launcher.star

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,13 @@ def launch(
8989
el_min_mem = el_min_mem if int(el_min_mem) > 0 else EXECUTION_MIN_MEMORY
9090
el_max_mem = el_max_mem if int(el_max_mem) > 0 else EXECUTION_MAX_MEMORY
9191

92+
cl_client_name = service_name.split("-")[3]
93+
9294
config = get_config(
9395
launcher.el_cl_genesis_data,
9496
image,
9597
existing_el_clients,
98+
cl_client_name,
9699
log_level,
97100
el_min_cpu,
98101
el_max_cpu,
@@ -127,6 +130,7 @@ def get_config(
127130
el_cl_genesis_data,
128131
image,
129132
existing_el_clients,
133+
cl_client_name,
130134
verbosity_level,
131135
el_min_cpu,
132136
el_max_cpu,
@@ -189,6 +193,12 @@ def get_config(
189193
min_memory=el_min_mem,
190194
max_memory=el_max_mem,
191195
env_vars=extra_env_vars,
196+
labels=shared_utils.label_maker(
197+
constants.EL_CLIENT_TYPE.ethereumjs,
198+
constants.CLIENT_TYPES.el,
199+
image,
200+
cl_client_name,
201+
),
192202
)
193203

194204

src/el/geth/geth_launcher.star

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,14 @@ def launch(
9494
el_min_mem = el_min_mem if int(el_min_mem) > 0 else EXECUTION_MIN_MEMORY
9595
el_max_mem = el_max_mem if int(el_max_mem) > 0 else EXECUTION_MAX_MEMORY
9696

97+
cl_client_name = service_name.split("-")[3]
98+
9799
config = get_config(
98100
launcher.network_id,
99101
launcher.el_cl_genesis_data,
100102
image,
101103
existing_el_clients,
104+
cl_client_name,
102105
log_level,
103106
el_min_cpu,
104107
el_max_cpu,
@@ -140,6 +143,7 @@ def get_config(
140143
el_cl_genesis_data,
141144
image,
142145
existing_el_clients,
146+
cl_client_name,
143147
verbosity_level,
144148
el_min_cpu,
145149
el_max_cpu,
@@ -259,6 +263,12 @@ def get_config(
259263
min_memory=el_min_mem,
260264
max_memory=el_max_mem,
261265
env_vars=extra_env_vars,
266+
labels=shared_utils.label_maker(
267+
constants.EL_CLIENT_TYPE.geth,
268+
constants.CLIENT_TYPES.el,
269+
image,
270+
cl_client_name,
271+
),
262272
)
263273

264274

src/el/nethermind/nethermind_launcher.star

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,13 @@ def launch(
8383
el_min_mem = el_min_mem if int(el_min_mem) > 0 else EXECUTION_MIN_MEMORY
8484
el_max_mem = el_max_mem if int(el_max_mem) > 0 else EXECUTION_MAX_MEMORY
8585

86+
cl_client_name = service_name.split("-")[3]
87+
8688
config = get_config(
8789
launcher.el_cl_genesis_data,
8890
image,
8991
existing_el_clients,
92+
cl_client_name,
9093
log_level,
9194
el_min_cpu,
9295
el_max_cpu,
@@ -123,6 +126,7 @@ def get_config(
123126
el_cl_genesis_data,
124127
image,
125128
existing_el_clients,
129+
cl_client_name,
126130
log_level,
127131
el_min_cpu,
128132
el_max_cpu,
@@ -184,6 +188,12 @@ def get_config(
184188
min_memory=el_min_mem,
185189
max_memory=el_max_mem,
186190
env_vars=extra_env_vars,
191+
labels=shared_utils.label_maker(
192+
constants.EL_CLIENT_TYPE.nethermind,
193+
constants.CLIENT_TYPES.el,
194+
image,
195+
cl_client_name,
196+
),
187197
)
188198

189199

0 commit comments

Comments
 (0)