fix: re-add images to labels (#634)

ethpandaops · May 23, 2024 · 71f6e28 · 71f6e28
1 parent e33b971
commit 71f6e28
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
         ),