Skip to content

Commit

Permalink
fix: use minimal-preset images for dora & assertoor when minimal pr…
Browse files Browse the repository at this point in the history
…eset is used (#532)

use `minimal-preset` images for dora & assertoor when minimal preset is
used
  • Loading branch information
pk910 committed Apr 2, 2024
1 parent 6f84e3d commit ad7773e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
3 changes: 1 addition & 2 deletions main.star
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,7 @@ def run(plan, args={}):
all_participants,
args_with_right_defaults.participants,
el_cl_data_files_artifact_uuid,
network_params.electra_fork_epoch,
network_params.network,
network_params,
global_node_selectors,
)
plan.print("Successfully launched dora")
Expand Down
2 changes: 2 additions & 0 deletions src/assertoor/assertoor_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ def get_config(

if assertoor_params.image != "":
IMAGE_NAME = assertoor_params.image
elif network_params.preset == "minimal":
IMAGE_NAME = "ethpandaops/assertoor:minimal-preset"
else:
IMAGE_NAME = "ethpandaops/assertoor:latest"

Expand Down
16 changes: 8 additions & 8 deletions src/dora/dora_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ def launch_dora(
participant_contexts,
participant_configs,
el_cl_data_files_artifact_uuid,
electra_fork_epoch,
network,
network_params,
global_node_selectors,
):
all_cl_client_info = []
Expand All @@ -50,7 +49,7 @@ def launch_dora(
)

template_data = new_config_template_data(
network, HTTP_PORT_NUMBER, all_cl_client_info
network_params.network, HTTP_PORT_NUMBER, all_cl_client_info
)

template_and_data = shared_utils.new_template_and_data(
Expand All @@ -66,8 +65,7 @@ def launch_dora(
config = get_config(
config_files_artifact_name,
el_cl_data_files_artifact_uuid,
electra_fork_epoch,
network,
network_params,
global_node_selectors,
)

Expand All @@ -77,16 +75,18 @@ def launch_dora(
def get_config(
config_files_artifact_name,
el_cl_data_files_artifact_uuid,
electra_fork_epoch,
network,
network_params,
node_selectors,
):
config_file_path = shared_utils.path_join(
DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
DORA_CONFIG_FILENAME,
)

IMAGE_NAME = "ethpandaops/dora:latest"
if network_params.preset == "minimal":
IMAGE_NAME = "ethpandaops/dora:minimal-preset"
else:
IMAGE_NAME = "ethpandaops/dora:latest"

return ServiceConfig(
image=IMAGE_NAME,
Expand Down

0 comments on commit ad7773e

Please sign in to comment.