From 71f6e28e682e47a550ffef037c7b26ce836d96df Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 23 May 2024 15:26:23 +0200 Subject: [PATCH] fix: re-add images to labels (#634) --- src/cl/grandine/grandine_launcher.star | 2 +- src/cl/lighthouse/lighthouse_launcher.star | 2 +- src/cl/lodestar/lodestar_launcher.star | 2 +- src/cl/nimbus/nimbus_launcher.star | 2 +- src/cl/prysm/prysm_launcher.star | 2 +- src/cl/teku/teku_launcher.star | 2 +- src/el/besu/besu_launcher.star | 2 +- src/el/erigon/erigon_launcher.star | 2 +- src/el/ethereumjs/ethereumjs_launcher.star | 2 +- src/el/geth/geth_launcher.star | 2 +- src/el/nethermind/nethermind_launcher.star | 2 +- src/el/nimbus-eth1/nimbus_launcher.star | 2 +- src/el/reth/reth_launcher.star | 2 +- src/shared_utils/shared_utils.star | 6 ++---- src/vc/lighthouse.star | 2 +- src/vc/lodestar.star | 2 +- src/vc/nimbus.star | 2 +- src/vc/prysm.star | 2 +- src/vc/teku.star | 2 +- 19 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star index 02a8e3b3e..8bfdc135e 100644 --- a/src/cl/grandine/grandine_launcher.star +++ b/src/cl/grandine/grandine_launcher.star @@ -409,7 +409,7 @@ def get_beacon_config( labels=shared_utils.label_maker( constants.CL_TYPE.grandine, constants.CLIENT_TYPES.cl, - # image, + image, el_context.client_name, extra_labels, ), diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index ed5ff0d4e..ca5b4cfac 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -405,7 +405,7 @@ def get_beacon_config( labels=shared_utils.label_maker( constants.CL_TYPE.lighthouse, constants.CLIENT_TYPES.cl, - # image, + image, el_context.client_name, extra_labels, ), diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index c08d15ba9..e410b2229 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -391,7 +391,7 @@ def get_beacon_config( labels=shared_utils.label_maker( constants.CL_TYPE.lodestar, constants.CLIENT_TYPES.cl, - # image, + image, el_context.client_name, extra_labels, ), diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star index 4f717a37a..2b04d4510 100644 --- a/src/cl/nimbus/nimbus_launcher.star +++ b/src/cl/nimbus/nimbus_launcher.star @@ -397,7 +397,7 @@ def get_beacon_config( labels=shared_utils.label_maker( constants.CL_TYPE.nimbus, constants.CLIENT_TYPES.cl, - # image, + image, el_context.client_name, extra_labels, ), diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index 3d02d64a0..8c36b28f6 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -375,7 +375,7 @@ def get_beacon_config( labels=shared_utils.label_maker( constants.CL_TYPE.prysm, constants.CLIENT_TYPES.cl, - # beacon_image, + beacon_image, el_context.client_name, extra_labels, ), diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index 3d27a5f2c..bc5a7e119 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -434,7 +434,7 @@ def get_beacon_config( labels=shared_utils.label_maker( constants.CL_TYPE.teku, constants.CLIENT_TYPES.cl, - # image, + image, el_context.client_name, extra_labels, ), diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index ae2dd0058..a76c6b174 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -293,7 +293,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.besu, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index 267daf0c3..9c96b7744 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -289,7 +289,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.erigon, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star index 68c9cd51f..187e422e9 100644 --- a/src/el/ethereumjs/ethereumjs_launcher.star +++ b/src/el/ethereumjs/ethereumjs_launcher.star @@ -277,7 +277,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.ethereumjs, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index b5580fe93..cff68c758 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -387,7 +387,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.geth, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 324cd6e2c..4e8ae8dc9 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -284,7 +284,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.nethermind, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/el/nimbus-eth1/nimbus_launcher.star b/src/el/nimbus-eth1/nimbus_launcher.star index 17b3b2ddd..30fdd0966 100644 --- a/src/el/nimbus-eth1/nimbus_launcher.star +++ b/src/el/nimbus-eth1/nimbus_launcher.star @@ -276,7 +276,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.nimbus, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star index 9e0c8035a..2158d5eb8 100644 --- a/src/el/reth/reth_launcher.star +++ b/src/el/reth/reth_launcher.star @@ -288,7 +288,7 @@ def get_config( labels=shared_utils.label_maker( constants.EL_TYPE.reth, constants.CLIENT_TYPES.el, - # image, + image, cl_client_name, extra_labels, ), diff --git a/src/shared_utils/shared_utils.star b/src/shared_utils/shared_utils.star index fae2135bd..225e5bdc6 100644 --- a/src/shared_utils/shared_utils.star +++ b/src/shared_utils/shared_utils.star @@ -65,13 +65,11 @@ def zfill_custom(value, width): return ("0" * (width - len(str(value)))) + str(value) -def label_maker( - client, client_type, connected_client, extra_labels -): # add image back later +def label_maker(client, client_type, image, connected_client, extra_labels): labels = { "ethereum-package.client": client, "ethereum-package.client-type": client_type, - # "ethereum-package.client-image": image.replace("/", "-").replace(":", "-"), + "ethereum-package.client-image": image.replace("/", "-").replace(":", "-"), "ethereum-package.connected-client": connected_client, } labels.update(extra_labels) # Add extra_labels to the labels dictionary diff --git a/src/vc/lighthouse.star b/src/vc/lighthouse.star index 1bb16a9c3..b011ac9e6 100644 --- a/src/vc/lighthouse.star +++ b/src/vc/lighthouse.star @@ -112,7 +112,7 @@ def get_config( labels=shared_utils.label_maker( constants.VC_TYPE.lighthouse, constants.CLIENT_TYPES.validator, - # image, + image, cl_context.client_name, extra_labels, ), diff --git a/src/vc/lodestar.star b/src/vc/lodestar.star index cf6a3d4df..3b3c1ca9b 100644 --- a/src/vc/lodestar.star +++ b/src/vc/lodestar.star @@ -110,7 +110,7 @@ def get_config( labels=shared_utils.label_maker( constants.VC_TYPE.lodestar, constants.CLIENT_TYPES.validator, - # image, + image, cl_context.client_name, extra_labels, ), diff --git a/src/vc/nimbus.star b/src/vc/nimbus.star index 7f7972a42..d84fd161a 100644 --- a/src/vc/nimbus.star +++ b/src/vc/nimbus.star @@ -84,7 +84,7 @@ def get_config( labels=shared_utils.label_maker( constants.VC_TYPE.nimbus, constants.CLIENT_TYPES.validator, - # image, + image, cl_context.client_name, extra_labels, ), diff --git a/src/vc/prysm.star b/src/vc/prysm.star index 8c777a713..3c7368c8e 100644 --- a/src/vc/prysm.star +++ b/src/vc/prysm.star @@ -99,7 +99,7 @@ def get_config( labels=shared_utils.label_maker( constants.VC_TYPE.prysm, constants.CLIENT_TYPES.validator, - # image, + image, cl_context.client_name, extra_labels, ), diff --git a/src/vc/teku.star b/src/vc/teku.star index d29ec9cc5..91065cdc2 100644 --- a/src/vc/teku.star +++ b/src/vc/teku.star @@ -95,7 +95,7 @@ def get_config( labels=shared_utils.label_maker( constants.VC_TYPE.teku, constants.CLIENT_TYPES.validator, - # image, + image, cl_context.client_name, extra_labels, ),