Skip to content

Commit a4b52da

Browse files
barnabasbusabarnabasbusa
authored
feat: add tolerations (#1137)
Depends on: kurtosis-tech/redis-package#16 kurtosis-tech/postgres-package#27
1 parent bc62c0c commit a4b52da

34 files changed

Lines changed: 247 additions & 22 deletions

‎.github/tests/minimal-fulu.yaml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
participants:
22
- el_type: geth
3-
el_image: ethpandaops/geth:fusaka-devnet-2
3+
el_image: ethpandaops/geth:fusaka-devnet-3
44
el_extra_params: ["--miner.extradata=lighthouseFromLocal"]
55
cl_type: lighthouse
6-
cl_image: ethpandaops/lighthouse:fusaka-devnet-2
6+
cl_image: ethpandaops/lighthouse:fusaka-devnet-3
77
supernode: true
88

99
- el_type: nethermind
10-
el_image: ethpandaops/nethermind:fusaka-devnet-2
10+
el_image: ethpandaops/nethermind:fusaka-devnet-3
1111
el_extra_params: ["--Blocks.ExtraData=TekuFromLocal"]
1212
cl_type: teku
13-
cl_image: ethpandaops/teku:fusaka-devnet-2
13+
cl_image: ethpandaops/teku:fusaka-devnet-3
1414

1515
- el_type: reth
16-
el_image: ethpandaops/reth:fusaka-devnet-2
16+
el_image: ethpandaops/reth:fusaka-devnet-3
1717
el_extra_params: ["--builder.extradata=LodestarFromLocal"]
1818
cl_type: lodestar
19-
cl_image: ethpandaops/lodestar:fusaka-devnet-2
19+
cl_image: ethpandaops/lodestar:fusaka-devnet-3
2020

2121
- el_type: geth
22-
el_image: ethpandaops/geth:fusaka-devnet-2
22+
el_image: ethpandaops/geth:fusaka-devnet-3
2323
el_extra_params: ["--miner.extradata=PrysmFromLocal"]
2424
cl_type: prysm
25-
cl_image: ethpandaops/prysm-beacon-chain:fusaka-devnet-2
26-
vc_image: ethpandaops/prysm-validator:fusaka-devnet-2
25+
cl_image: ethpandaops/prysm-beacon-chain:fusaka-devnet-3-minimal
2726

2827
- el_type: nethermind
29-
el_image: ethpandaops/nethermind:fusaka-devnet-2
28+
el_image: ethpandaops/nethermind:fusaka-devnet-3
3029
el_extra_params: ["--Blocks.ExtraData=NimbusFromLocal"]
3130
cl_type: nimbus
32-
cl_image: ethpandaops/nimbus-eth2:fusaka-devnet-2
31+
cl_image: ethpandaops/nimbus-eth2:fusaka-devnet-3-minimal
3332

3433
- el_type: reth
35-
el_image: ethpandaops/reth:fusaka-devnet-2
34+
el_image: ethpandaops/reth:fusaka-devnet-3
3635
el_extra_params: ["--builder.extradata=GrandineFromLocal"]
3736
cl_type: grandine
38-
cl_image: ethpandaops/grandine:fusaka-devnet-2
37+
cl_image: ethpandaops/grandine:fusaka-devnet-3-minimal
3938
additional_services:
4039
- dora
4140
- tx_fuzz

‎.github/tests/mix-public.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ participants:
99
cl_type: lighthouse
1010
- el_type: reth
1111
cl_type: lodestar
12-
- el_type: nimbus
13-
cl_type: teku
14-
el_image: statusim/nimbus-eth1:master
1512
- el_type: ethrex
1613
cl_type: grandine
1714
port_publisher:

‎main.star‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ def run(plan, args={}):
262262
plan,
263263
all_el_contexts,
264264
global_node_selectors,
265+
global_tolerations,
265266
)
266267
fuzz_target = "http://{0}:{1}".format(
267268
broadcaster_service.ip_address,
@@ -298,6 +299,7 @@ def run(plan, args={}):
298299
jwt_file,
299300
args_with_right_defaults.global_log_level,
300301
global_node_selectors,
302+
global_tolerations,
301303
args_with_right_defaults.mev_params,
302304
)
303305
mev_endpoints.append(endpoint)
@@ -330,6 +332,7 @@ def run(plan, args={}):
330332
args_with_right_defaults.port_publisher,
331333
num_participants,
332334
global_node_selectors,
335+
global_tolerations,
333336
)
334337
elif args_with_right_defaults.mev_type == constants.MEV_RS_MEV_TYPE:
335338
endpoint, relay_ip_address, relay_port = mev_rs_mev_relay.launch_mev_relay(
@@ -341,6 +344,7 @@ def run(plan, args={}):
341344
args_with_right_defaults.port_publisher,
342345
num_participants,
343346
global_node_selectors,
347+
global_tolerations,
344348
)
345349
else:
346350
fail("Invalid MEV type")
@@ -387,6 +391,7 @@ def run(plan, args={}):
387391
args_with_right_defaults.port_publisher,
388392
index,
389393
global_node_selectors,
394+
global_tolerations,
390395
)
391396
elif args_with_right_defaults.mev_type == constants.MEV_RS_MEV_TYPE:
392397
plan.print("Launching mev-rs mev boost")
@@ -411,6 +416,7 @@ def run(plan, args={}):
411416
args_with_right_defaults.port_publisher,
412417
index,
413418
global_node_selectors,
419+
global_tolerations,
414420
)
415421
elif (
416422
args_with_right_defaults.mev_type == constants.COMMIT_BOOST_MEV_TYPE
@@ -437,6 +443,7 @@ def run(plan, args={}):
437443
args_with_right_defaults.port_publisher,
438444
index,
439445
global_node_selectors,
446+
global_tolerations,
440447
final_genesis_timestamp,
441448
)
442449
else:
@@ -468,6 +475,7 @@ def run(plan, args={}):
468475
fuzz_target,
469476
tx_fuzz_params,
470477
global_node_selectors,
478+
global_tolerations,
471479
)
472480
plan.print("Successfully launched tx-fuzz")
473481
elif additional_service == "forkmon":
@@ -480,6 +488,7 @@ def run(plan, args={}):
480488
forkmon_config_template,
481489
all_el_contexts,
482490
global_node_selectors,
491+
global_tolerations,
483492
args_with_right_defaults.port_publisher,
484493
index,
485494
args_with_right_defaults.docker_cache_params,
@@ -492,6 +501,7 @@ def run(plan, args={}):
492501
all_el_contexts,
493502
persistent,
494503
global_node_selectors,
504+
global_tolerations,
495505
args_with_right_defaults.port_publisher,
496506
index,
497507
args_with_right_defaults.docker_cache_params,
@@ -511,6 +521,7 @@ def run(plan, args={}):
511521
network_params,
512522
dora_params,
513523
global_node_selectors,
524+
global_tolerations,
514525
mev_endpoints,
515526
mev_endpoint_names,
516527
args_with_right_defaults.port_publisher,
@@ -530,6 +541,7 @@ def run(plan, args={}):
530541
args_with_right_defaults.participants,
531542
network_params,
532543
global_node_selectors,
544+
global_tolerations,
533545
args_with_right_defaults.port_publisher,
534546
index,
535547
args_with_right_defaults.docker_cache_params,
@@ -547,6 +559,7 @@ def run(plan, args={}):
547559
args_with_right_defaults.participants,
548560
network_params,
549561
global_node_selectors,
562+
global_tolerations,
550563
args_with_right_defaults.port_publisher,
551564
index,
552565
args_with_right_defaults.docker_cache_params,
@@ -562,6 +575,7 @@ def run(plan, args={}):
562575
network_params,
563576
persistent,
564577
global_node_selectors,
578+
global_tolerations,
565579
args_with_right_defaults.port_publisher,
566580
index,
567581
args_with_right_defaults.docker_cache_params,
@@ -580,6 +594,7 @@ def run(plan, args={}):
580594
el_cl_data_files_artifact_uuid,
581595
network_params,
582596
global_node_selectors,
597+
global_tolerations,
583598
final_genesis_timestamp,
584599
args_with_right_defaults.port_publisher,
585600
index,
@@ -599,6 +614,7 @@ def run(plan, args={}):
599614
el_cl_data_files_artifact_uuid,
600615
network_params,
601616
global_node_selectors,
617+
global_tolerations,
602618
final_genesis_timestamp,
603619
args_with_right_defaults.port_publisher,
604620
index,
@@ -616,6 +632,7 @@ def run(plan, args={}):
616632
args_with_right_defaults.port_publisher,
617633
index,
618634
global_node_selectors,
635+
global_tolerations,
619636
args_with_right_defaults.docker_cache_params,
620637
)
621638
plan.print("Successfully launched apache")
@@ -630,6 +647,7 @@ def run(plan, args={}):
630647
args_with_right_defaults.port_publisher,
631648
index,
632649
global_node_selectors,
650+
global_tolerations,
633651
args_with_right_defaults.docker_cache_params,
634652
)
635653
plan.print("Successfully launched nginx")
@@ -646,6 +664,7 @@ def run(plan, args={}):
646664
all_el_contexts,
647665
persistent,
648666
global_node_selectors,
667+
global_tolerations,
649668
args_with_right_defaults.port_publisher,
650669
index,
651670
)
@@ -676,6 +695,7 @@ def run(plan, args={}):
676695
grafana_dashboards_config_template,
677696
prometheus_private_url,
678697
global_node_selectors,
698+
global_tolerations,
679699
args_with_right_defaults.grafana_params,
680700
args_with_right_defaults.port_publisher,
681701
index,
@@ -701,6 +721,7 @@ def run(plan, args={}):
701721
args_with_right_defaults.port_publisher,
702722
index,
703723
global_node_selectors,
724+
global_tolerations,
704725
args_with_right_defaults.docker_cache_params,
705726
)
706727
plan.print("Successfully launched assertoor")
@@ -712,6 +733,7 @@ def run(plan, args={}):
712733
fuzz_target,
713734
args_with_right_defaults.custom_flood_params,
714735
global_node_selectors,
736+
global_tolerations,
715737
args_with_right_defaults.docker_cache_params,
716738
)
717739
elif additional_service == "spamoor":
@@ -731,6 +753,7 @@ def run(plan, args={}):
731753
args_with_right_defaults.participants,
732754
args_with_right_defaults.spamoor_params,
733755
global_node_selectors,
756+
global_tolerations,
734757
args_with_right_defaults.network_params,
735758
args_with_right_defaults.port_publisher,
736759
index,
@@ -762,6 +785,7 @@ def run(plan, args={}):
762785
grafana_dashboards_config_template,
763786
prometheus_private_url,
764787
global_node_selectors,
788+
global_tolerations,
765789
args_with_right_defaults.grafana_params,
766790
args_with_right_defaults.port_publisher,
767791
prometheus_grafana_index,

‎src/apache/apache_launcher.star‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
shared_utils = import_module("../shared_utils/shared_utils.star")
22
static_files = import_module("../static_files/static_files.star")
33
constants = import_module("../package_io/constants.star")
4+
input_parser = import_module("../package_io/input_parser.star")
45
SERVICE_NAME = "apache"
56
HTTP_PORT_ID = "http"
67
HTTP_PORT_NUMBER = 80
@@ -36,12 +37,15 @@ def launch_apache(
3637
port_publisher,
3738
index,
3839
global_node_selectors,
40+
global_tolerations,
3941
docker_cache_params,
4042
):
4143
config_files_artifact_name = plan.upload_files(
4244
src=static_files.APACHE_CONFIG_FILEPATH, name="apache-config"
4345
)
4446

47+
tolerations = input_parser.get_client_tolerations([], [], global_tolerations)
48+
4549
public_ports = shared_utils.get_additional_service_standard_public_port(
4650
port_publisher,
4751
constants.HTTP_PORT_ID,
@@ -104,6 +108,7 @@ def launch_apache(
104108
public_ports,
105109
bootstrap_info_files_artifact_name,
106110
global_node_selectors,
111+
tolerations,
107112
docker_cache_params,
108113
)
109114

@@ -116,6 +121,7 @@ def get_config(
116121
public_ports,
117122
bootstrap_info_files_artifact_name,
118123
node_selectors,
124+
tolerations,
119125
docker_cache_params,
120126
):
121127
files = {
@@ -172,6 +178,7 @@ def get_config(
172178
min_memory=MIN_MEMORY,
173179
max_memory=MAX_MEMORY,
174180
node_selectors=node_selectors,
181+
tolerations=tolerations,
175182
)
176183

177184

‎src/assertoor/assertoor_launcher.star‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
shared_utils = import_module("../shared_utils/shared_utils.star")
22
static_files = import_module("../static_files/static_files.star")
33
constants = import_module("../package_io/constants.star")
4+
input_parser = import_module("../package_io/input_parser.star")
45
SERVICE_NAME = "assertoor"
56

67
HTTP_PORT_ID = "http"
@@ -39,6 +40,7 @@ def launch_assertoor(
3940
port_publisher,
4041
index,
4142
global_node_selectors,
43+
global_tolerations,
4244
docker_cache_params,
4345
):
4446
all_client_info = []
@@ -53,6 +55,8 @@ def launch_assertoor(
5355
0,
5456
)
5557

58+
tolerations = input_parser.get_client_tolerations([], [], global_tolerations)
59+
5660
for index, participant in enumerate(participant_contexts):
5761
(
5862
full_name,
@@ -113,6 +117,7 @@ def launch_assertoor(
113117
assertoor_params,
114118
public_ports,
115119
global_node_selectors,
120+
tolerations,
116121
docker_cache_params,
117122
)
118123

@@ -126,6 +131,7 @@ def get_config(
126131
assertoor_params,
127132
public_ports,
128133
node_selectors,
134+
tolerations,
129135
docker_cache_params,
130136
):
131137
config_file_path = shared_utils.path_join(
@@ -166,6 +172,7 @@ def get_config(
166172
min_memory=MIN_MEMORY,
167173
max_memory=MAX_MEMORY,
168174
node_selectors=node_selectors,
175+
tolerations=tolerations,
169176
)
170177

171178

‎src/blobber/blobber_launcher.star‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ def launch(
4141
beacon_http_url,
4242
participant,
4343
node_selectors,
44+
global_tolerations,
4445
):
46+
tolerations = input_parser.get_client_tolerations([], [], global_tolerations)
47+
4548
blobber_service_name = "{0}".format(service_name)
4649

4750
blobber_config = get_config(
@@ -50,6 +53,7 @@ def launch(
5053
beacon_http_url,
5154
participant,
5255
node_selectors,
56+
tolerations,
5357
)
5458

5559
blobber_service = plan.add_service(blobber_service_name, blobber_config)
@@ -65,6 +69,7 @@ def get_config(
6569
beacon_http_url,
6670
participant,
6771
node_selectors,
72+
tolerations,
6873
):
6974
validator_root_dirpath = shared_utils.path_join(
7075
VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS,
@@ -95,4 +100,5 @@ def get_config(
95100
min_memory=MIN_MEMORY,
96101
max_memory=MAX_MEMORY,
97102
node_selectors=node_selectors,
103+
tolerations=tolerations,
98104
)

0 commit comments

Comments
 (0)