From cc29f6e1d4db195238a23deecea9302589ee89e1 Mon Sep 17 00:00:00 2001 From: Samuel Laferriere Date: Sun, 9 Feb 2025 23:47:07 -0500 Subject: [PATCH 1/3] fix: starlark plan errors when kt run without args file --- main.star | 2 +- src/package_io/sanity_check.star | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/main.star b/main.star index edc44fc6..6c09e2d4 100644 --- a/main.star +++ b/main.star @@ -41,7 +41,7 @@ def run(plan, args): # need to do a raw get here in case only optimism_package is provided. # .get will return None if the key is in the config with a None value. - optimism_args = args.get("optimism_package") or input_parser.default_optimism_args() + optimism_args = args.get("optimism_package") or input_parser.default_optimism_params() optimism_args_with_right_defaults = input_parser.input_parser(plan, optimism_args) global_tolerations = optimism_args_with_right_defaults.global_tolerations global_node_selectors = optimism_args_with_right_defaults.global_node_selectors diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index 928ad556..14fdca94 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -71,8 +71,28 @@ PARTICIPANT_CATEGORIES = { "cl_max_mem", "el_builder_type", "el_builder_image", + "el_builder_log_level", + "el_builder_extra_env_vars", + "el_builder_extra_labels", + "el_builder_extra_params", + "el_builder_tolerations", + "el_builder_volume_size", + "el_builder_min_cpu", + "el_builder_max_cpu", + "el_builder_min_mem", + "el_builder_max_mem", "cl_builder_type", "cl_builder_image", + "cl_builder_log_level", + "cl_builder_extra_env_vars", + "cl_builder_extra_labels", + "cl_builder_extra_params", + "cl_builder_tolerations", + "cl_builder_volume_size", + "cl_builder_min_cpu", + "cl_builder_max_cpu", + "cl_builder_min_mem", + "cl_builder_max_mem", "node_selectors", "tolerations", "count", From cafb83528e77e4989e9f0c363fe1b40c573522e7 Mon Sep 17 00:00:00 2001 From: Samuel Laferriere Date: Tue, 11 Feb 2025 16:00:25 -0500 Subject: [PATCH 2/3] fix: make `kt run .` without --args-file run without error every software should run fine even without a config file --- .github/workflows/per-pr.yml | 17 +++++++++++++++++ src/package_io/input_parser.star | 8 +++++++- src/package_io/sanity_check.star | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index b70ff204..42412665 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -30,6 +30,23 @@ jobs: - name: Run Starlark run: kurtosis run ${{ github.workspace }} --args-file ${{ matrix.file_name }} --verbosity detailed + # Make sure that `kurtosis run .` without an --args-file works fine (the defaults in input_parser.star are correct) + run_without_args: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Setup Kurtosis + run: | + echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list + sudo apt update + sudo apt install kurtosis-cli + kurtosis analytics disable + + - name: Run Starlark + run: kurtosis run ${{ github.workspace }} --verbosity detailed + lint: runs-on: ubuntu-latest steps: diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 1a82fda8..4528e325 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -413,7 +413,7 @@ def default_optimism_params(): return { "observability": default_observability_params(), "interop": default_interop_params(), - "altda": default_altda_deploy_config(), + "altda_deploy_config": default_altda_deploy_config(), "chains": default_chains(), "op_contract_deployer_params": default_op_contract_deployer_params(), "global_log_level": "info", @@ -614,6 +614,12 @@ def default_op_contract_deployer_params(): def default_ethereum_package_network_params(): return { + "participants": [ + { + "el_type": "geth", + "cl_type": "teku", + } + ], "network_params": { "preset": "minimal", "genesis_delay": 5, diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index 14fdca94..17323828 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -123,6 +123,7 @@ SUBCATEGORY_PARAMS = { "proposer_params": ["image", "extra_params", "game_type", "proposal_interval"], "mev_params": ["rollup_boost_image", "builder_host", "builder_port"], "da_server_params": [ + "enabled", "image", "cmd", ], From d387aeda3e6056a0885a90244a9c8b62ec0662d1 Mon Sep 17 00:00:00 2001 From: Samuel Laferriere Date: Tue, 11 Mar 2025 15:36:51 -0400 Subject: [PATCH 3/3] style: kt lint format --- main.star | 4 +++- src/package_io/input_parser.star | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main.star b/main.star index 34f5151e..665c7382 100644 --- a/main.star +++ b/main.star @@ -41,7 +41,9 @@ def run(plan, args): # need to do a raw get here in case only optimism_package is provided. # .get will return None if the key is in the config with a None value. - optimism_args = args.get("optimism_package") or input_parser.default_optimism_params() + optimism_args = ( + args.get("optimism_package") or input_parser.default_optimism_params() + ) optimism_args_with_right_defaults = input_parser.input_parser(plan, optimism_args) global_tolerations = optimism_args_with_right_defaults.global_tolerations global_node_selectors = optimism_args_with_right_defaults.global_node_selectors diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 7821f1c7..7c8191ec 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -638,7 +638,7 @@ def default_ethereum_package_network_params(): } } ), - } + }, }