feat: add tolerations to tooling

.github/tests/minimal-fulu.yaml

@@ -1,41 +1,40 @@
 participants:
   - el_type: geth
-    el_image: ethpandaops/geth:fusaka-devnet-2
+    el_image: ethpandaops/geth:fusaka-devnet-3
     el_extra_params: ["--miner.extradata=lighthouseFromLocal"]
     cl_type: lighthouse
-    cl_image: ethpandaops/lighthouse:fusaka-devnet-2
+    cl_image: ethpandaops/lighthouse:fusaka-devnet-3
     supernode: true
 
   - el_type: nethermind
-    el_image: ethpandaops/nethermind:fusaka-devnet-2
+    el_image: ethpandaops/nethermind:fusaka-devnet-3
     el_extra_params: ["--Blocks.ExtraData=TekuFromLocal"]
     cl_type: teku
-    cl_image: ethpandaops/teku:fusaka-devnet-2
+    cl_image: ethpandaops/teku:fusaka-devnet-3
 
   - el_type: reth
-    el_image: ethpandaops/reth:fusaka-devnet-2
+    el_image: ethpandaops/reth:fusaka-devnet-3
     el_extra_params: ["--builder.extradata=LodestarFromLocal"]
     cl_type: lodestar
-    cl_image: ethpandaops/lodestar:fusaka-devnet-2
+    cl_image: ethpandaops/lodestar:fusaka-devnet-3
 
   - el_type: geth
-    el_image: ethpandaops/geth:fusaka-devnet-2
+    el_image: ethpandaops/geth:fusaka-devnet-3
     el_extra_params: ["--miner.extradata=PrysmFromLocal"]
     cl_type: prysm
-    cl_image: ethpandaops/prysm-beacon-chain:fusaka-devnet-2
-    vc_image: ethpandaops/prysm-validator:fusaka-devnet-2
+    cl_image: ethpandaops/prysm-beacon-chain:fusaka-devnet-3-minimal
 
   - el_type: nethermind
-    el_image: ethpandaops/nethermind:fusaka-devnet-2
+    el_image: ethpandaops/nethermind:fusaka-devnet-3
     el_extra_params: ["--Blocks.ExtraData=NimbusFromLocal"]
     cl_type: nimbus
-    cl_image: ethpandaops/nimbus-eth2:fusaka-devnet-2
+    cl_image: ethpandaops/nimbus-eth2:fusaka-devnet-3-minimal
 
   - el_type: reth
-    el_image: ethpandaops/reth:fusaka-devnet-2
+    el_image: ethpandaops/reth:fusaka-devnet-3
     el_extra_params: ["--builder.extradata=GrandineFromLocal"]
     cl_type: grandine
-    cl_image: ethpandaops/grandine:fusaka-devnet-2
+    cl_image: ethpandaops/grandine:fusaka-devnet-3-minimal
 additional_services:
   - dora
   - tx_fuzz

.github/tests/mix-public.yaml

@@ -9,9 +9,6 @@ participants:
     cl_type: lighthouse
   - el_type: reth
     cl_type: lodestar
-  - el_type: nimbus
-    cl_type: teku
-    el_image: statusim/nimbus-eth1:master
   - el_type: ethrex
     cl_type: grandine
 port_publisher:

main.star

@@ -262,6 +262,7 @@ def run(plan, args={}):
             plan,
             all_el_contexts,
             global_node_selectors,
+            global_tolerations,
         )
         fuzz_target = "http://{0}:{1}".format(
             broadcaster_service.ip_address,
@@ -298,6 +299,7 @@ def run(plan, args={}):
             jwt_file,
             args_with_right_defaults.global_log_level,
             global_node_selectors,
+            global_tolerations,
             args_with_right_defaults.mev_params,
         )
         mev_endpoints.append(endpoint)
@@ -330,6 +332,7 @@ def run(plan, args={}):
                 args_with_right_defaults.port_publisher,
                 num_participants,
                 global_node_selectors,
+                global_tolerations,
             )
         elif args_with_right_defaults.mev_type == constants.MEV_RS_MEV_TYPE:
             endpoint, relay_ip_address, relay_port = mev_rs_mev_relay.launch_mev_relay(
@@ -341,6 +344,7 @@ def run(plan, args={}):
                 args_with_right_defaults.port_publisher,
                 num_participants,
                 global_node_selectors,
+                global_tolerations,
             )
         else:
             fail("Invalid MEV type")
@@ -387,6 +391,7 @@ def run(plan, args={}):
                         args_with_right_defaults.port_publisher,
                         index,
                         global_node_selectors,
+                        global_tolerations,
                     )
                 elif args_with_right_defaults.mev_type == constants.MEV_RS_MEV_TYPE:
                     plan.print("Launching mev-rs mev boost")
@@ -411,6 +416,7 @@ def run(plan, args={}):
                         args_with_right_defaults.port_publisher,
                         index,
                         global_node_selectors,
+                        global_tolerations,
                     )
                 elif (
                     args_with_right_defaults.mev_type == constants.COMMIT_BOOST_MEV_TYPE
@@ -437,6 +443,7 @@ def run(plan, args={}):
                         args_with_right_defaults.port_publisher,
                         index,
                         global_node_selectors,
+                        global_tolerations,
                         final_genesis_timestamp,
                     )
                 else:
@@ -468,6 +475,7 @@ def run(plan, args={}):
                 fuzz_target,
                 tx_fuzz_params,
                 global_node_selectors,
+                global_tolerations,
             )
             plan.print("Successfully launched tx-fuzz")
         elif additional_service == "forkmon":
@@ -480,6 +488,7 @@ def run(plan, args={}):
                 forkmon_config_template,
                 all_el_contexts,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
                 args_with_right_defaults.docker_cache_params,
@@ -492,6 +501,7 @@ def run(plan, args={}):
                 all_el_contexts,
                 persistent,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
                 args_with_right_defaults.docker_cache_params,
@@ -511,6 +521,7 @@ def run(plan, args={}):
                 network_params,
                 dora_params,
                 global_node_selectors,
+                global_tolerations,
                 mev_endpoints,
                 mev_endpoint_names,
                 args_with_right_defaults.port_publisher,
@@ -530,6 +541,7 @@ def run(plan, args={}):
                 args_with_right_defaults.participants,
                 network_params,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
                 args_with_right_defaults.docker_cache_params,
@@ -547,6 +559,7 @@ def run(plan, args={}):
                 args_with_right_defaults.participants,
                 network_params,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
                 args_with_right_defaults.docker_cache_params,
@@ -562,6 +575,7 @@ def run(plan, args={}):
                 network_params,
                 persistent,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
                 args_with_right_defaults.docker_cache_params,
@@ -580,6 +594,7 @@ def run(plan, args={}):
                 el_cl_data_files_artifact_uuid,
                 network_params,
                 global_node_selectors,
+                global_tolerations,
                 final_genesis_timestamp,
                 args_with_right_defaults.port_publisher,
                 index,
@@ -599,6 +614,7 @@ def run(plan, args={}):
                 el_cl_data_files_artifact_uuid,
                 network_params,
                 global_node_selectors,
+                global_tolerations,
                 final_genesis_timestamp,
                 args_with_right_defaults.port_publisher,
                 index,
@@ -616,6 +632,7 @@ def run(plan, args={}):
                 args_with_right_defaults.port_publisher,
                 index,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.docker_cache_params,
             )
             plan.print("Successfully launched apache")
@@ -630,6 +647,7 @@ def run(plan, args={}):
                 args_with_right_defaults.port_publisher,
                 index,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.docker_cache_params,
             )
             plan.print("Successfully launched nginx")
@@ -646,6 +664,7 @@ def run(plan, args={}):
                 all_el_contexts,
                 persistent,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
             )
@@ -676,6 +695,7 @@ def run(plan, args={}):
                 grafana_dashboards_config_template,
                 prometheus_private_url,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.grafana_params,
                 args_with_right_defaults.port_publisher,
                 index,
@@ -701,6 +721,7 @@ def run(plan, args={}):
                 args_with_right_defaults.port_publisher,
                 index,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.docker_cache_params,
             )
             plan.print("Successfully launched assertoor")
@@ -712,6 +733,7 @@ def run(plan, args={}):
                 fuzz_target,
                 args_with_right_defaults.custom_flood_params,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.docker_cache_params,
             )
         elif additional_service == "spamoor":
@@ -731,6 +753,7 @@ def run(plan, args={}):
                 args_with_right_defaults.participants,
                 args_with_right_defaults.spamoor_params,
                 global_node_selectors,
+                global_tolerations,
                 args_with_right_defaults.network_params,
                 args_with_right_defaults.port_publisher,
                 index,
@@ -762,6 +785,7 @@ def run(plan, args={}):
             grafana_dashboards_config_template,
             prometheus_private_url,
             global_node_selectors,
+            global_tolerations,
             args_with_right_defaults.grafana_params,
             args_with_right_defaults.port_publisher,
             prometheus_grafana_index,

src/apache/apache_launcher.star

@@ -1,6 +1,7 @@
 shared_utils = import_module("../shared_utils/shared_utils.star")
 static_files = import_module("../static_files/static_files.star")
 constants = import_module("../package_io/constants.star")
+input_parser = import_module("../package_io/input_parser.star")
 SERVICE_NAME = "apache"
 HTTP_PORT_ID = "http"
 HTTP_PORT_NUMBER = 80
@@ -36,12 +37,15 @@ def launch_apache(
     port_publisher,
     index,
     global_node_selectors,
+    global_tolerations,
     docker_cache_params,
 ):
     config_files_artifact_name = plan.upload_files(
         src=static_files.APACHE_CONFIG_FILEPATH, name="apache-config"
     )
 
+    tolerations = input_parser.get_client_tolerations([], [], global_tolerations)
+
     public_ports = shared_utils.get_additional_service_standard_public_port(
         port_publisher,
         constants.HTTP_PORT_ID,
@@ -104,6 +108,7 @@ def launch_apache(
         public_ports,
         bootstrap_info_files_artifact_name,
         global_node_selectors,
+        tolerations,
         docker_cache_params,
     )
 
@@ -116,6 +121,7 @@ def get_config(
     public_ports,
     bootstrap_info_files_artifact_name,
     node_selectors,
+    tolerations,
     docker_cache_params,
 ):
     files = {
@@ -172,6 +178,7 @@ def get_config(
         min_memory=MIN_MEMORY,
         max_memory=MAX_MEMORY,
         node_selectors=node_selectors,
+        tolerations=tolerations,
     )
 
 

src/assertoor/assertoor_launcher.star

@@ -1,6 +1,7 @@
 shared_utils = import_module("../shared_utils/shared_utils.star")
 static_files = import_module("../static_files/static_files.star")
 constants = import_module("../package_io/constants.star")
+input_parser = import_module("../package_io/input_parser.star")
 SERVICE_NAME = "assertoor"
 
 HTTP_PORT_ID = "http"
@@ -39,6 +40,7 @@ def launch_assertoor(
     port_publisher,
     index,
     global_node_selectors,
+    global_tolerations,
     docker_cache_params,
 ):
     all_client_info = []
@@ -53,6 +55,8 @@ def launch_assertoor(
         0,
     )
 
+    tolerations = input_parser.get_client_tolerations([], [], global_tolerations)
+
     for index, participant in enumerate(participant_contexts):
         (
             full_name,
@@ -113,6 +117,7 @@ def launch_assertoor(
         assertoor_params,
         public_ports,
         global_node_selectors,
+        tolerations,
         docker_cache_params,
     )
 
@@ -126,6 +131,7 @@ def get_config(
     assertoor_params,
     public_ports,
     node_selectors,
+    tolerations,
     docker_cache_params,
 ):
     config_file_path = shared_utils.path_join(
@@ -166,6 +172,7 @@ def get_config(
         min_memory=MIN_MEMORY,
         max_memory=MAX_MEMORY,
         node_selectors=node_selectors,
+        tolerations=tolerations,
     )
 
 

src/blobber/blobber_launcher.star

@@ -41,7 +41,10 @@ def launch(
     beacon_http_url,
     participant,
     node_selectors,
+    global_tolerations,
 ):
+    tolerations = input_parser.get_client_tolerations([], [], global_tolerations)
+
     blobber_service_name = "{0}".format(service_name)
 
     blobber_config = get_config(
@@ -50,6 +53,7 @@ def launch(
         beacon_http_url,
         participant,
         node_selectors,
+        tolerations,
     )
 
     blobber_service = plan.add_service(blobber_service_name, blobber_config)
@@ -65,6 +69,7 @@ def get_config(
     beacon_http_url,
     participant,
     node_selectors,
+    tolerations,
 ):
     validator_root_dirpath = shared_utils.path_join(
         VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS,
@@ -95,4 +100,5 @@ def get_config(
         min_memory=MIN_MEMORY,
         max_memory=MAX_MEMORY,
         node_selectors=node_selectors,
+        tolerations=tolerations,
     )