Commit 71f6e28e authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

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

parent e33b9717
...@@ -409,7 +409,7 @@ def get_beacon_config( ...@@ -409,7 +409,7 @@ def get_beacon_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.CL_TYPE.grandine, constants.CL_TYPE.grandine,
constants.CLIENT_TYPES.cl, constants.CLIENT_TYPES.cl,
# image, image,
el_context.client_name, el_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -405,7 +405,7 @@ def get_beacon_config( ...@@ -405,7 +405,7 @@ def get_beacon_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.CL_TYPE.lighthouse, constants.CL_TYPE.lighthouse,
constants.CLIENT_TYPES.cl, constants.CLIENT_TYPES.cl,
# image, image,
el_context.client_name, el_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -391,7 +391,7 @@ def get_beacon_config( ...@@ -391,7 +391,7 @@ def get_beacon_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.CL_TYPE.lodestar, constants.CL_TYPE.lodestar,
constants.CLIENT_TYPES.cl, constants.CLIENT_TYPES.cl,
# image, image,
el_context.client_name, el_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -397,7 +397,7 @@ def get_beacon_config( ...@@ -397,7 +397,7 @@ def get_beacon_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.CL_TYPE.nimbus, constants.CL_TYPE.nimbus,
constants.CLIENT_TYPES.cl, constants.CLIENT_TYPES.cl,
# image, image,
el_context.client_name, el_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -375,7 +375,7 @@ def get_beacon_config( ...@@ -375,7 +375,7 @@ def get_beacon_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.CL_TYPE.prysm, constants.CL_TYPE.prysm,
constants.CLIENT_TYPES.cl, constants.CLIENT_TYPES.cl,
# beacon_image, beacon_image,
el_context.client_name, el_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -434,7 +434,7 @@ def get_beacon_config( ...@@ -434,7 +434,7 @@ def get_beacon_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.CL_TYPE.teku, constants.CL_TYPE.teku,
constants.CLIENT_TYPES.cl, constants.CLIENT_TYPES.cl,
# image, image,
el_context.client_name, el_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -293,7 +293,7 @@ def get_config( ...@@ -293,7 +293,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.besu, constants.EL_TYPE.besu,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -289,7 +289,7 @@ def get_config( ...@@ -289,7 +289,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.erigon, constants.EL_TYPE.erigon,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -277,7 +277,7 @@ def get_config( ...@@ -277,7 +277,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.ethereumjs, constants.EL_TYPE.ethereumjs,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -387,7 +387,7 @@ def get_config( ...@@ -387,7 +387,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.geth, constants.EL_TYPE.geth,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -284,7 +284,7 @@ def get_config( ...@@ -284,7 +284,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.nethermind, constants.EL_TYPE.nethermind,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -276,7 +276,7 @@ def get_config( ...@@ -276,7 +276,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.nimbus, constants.EL_TYPE.nimbus,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -288,7 +288,7 @@ def get_config( ...@@ -288,7 +288,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.EL_TYPE.reth, constants.EL_TYPE.reth,
constants.CLIENT_TYPES.el, constants.CLIENT_TYPES.el,
# image, image,
cl_client_name, cl_client_name,
extra_labels, extra_labels,
), ),
......
...@@ -65,13 +65,11 @@ def zfill_custom(value, width): ...@@ -65,13 +65,11 @@ def zfill_custom(value, width):
return ("0" * (width - len(str(value)))) + str(value) return ("0" * (width - len(str(value)))) + str(value)
def label_maker( def label_maker(client, client_type, image, connected_client, extra_labels):
client, client_type, connected_client, extra_labels
): # add image back later
labels = { labels = {
"ethereum-package.client": client, "ethereum-package.client": client,
"ethereum-package.client-type": client_type, "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, "ethereum-package.connected-client": connected_client,
} }
labels.update(extra_labels) # Add extra_labels to the labels dictionary labels.update(extra_labels) # Add extra_labels to the labels dictionary
......
...@@ -112,7 +112,7 @@ def get_config( ...@@ -112,7 +112,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.VC_TYPE.lighthouse, constants.VC_TYPE.lighthouse,
constants.CLIENT_TYPES.validator, constants.CLIENT_TYPES.validator,
# image, image,
cl_context.client_name, cl_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -110,7 +110,7 @@ def get_config( ...@@ -110,7 +110,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.VC_TYPE.lodestar, constants.VC_TYPE.lodestar,
constants.CLIENT_TYPES.validator, constants.CLIENT_TYPES.validator,
# image, image,
cl_context.client_name, cl_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -84,7 +84,7 @@ def get_config( ...@@ -84,7 +84,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.VC_TYPE.nimbus, constants.VC_TYPE.nimbus,
constants.CLIENT_TYPES.validator, constants.CLIENT_TYPES.validator,
# image, image,
cl_context.client_name, cl_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -99,7 +99,7 @@ def get_config( ...@@ -99,7 +99,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.VC_TYPE.prysm, constants.VC_TYPE.prysm,
constants.CLIENT_TYPES.validator, constants.CLIENT_TYPES.validator,
# image, image,
cl_context.client_name, cl_context.client_name,
extra_labels, extra_labels,
), ),
......
...@@ -95,7 +95,7 @@ def get_config( ...@@ -95,7 +95,7 @@ def get_config(
labels=shared_utils.label_maker( labels=shared_utils.label_maker(
constants.VC_TYPE.teku, constants.VC_TYPE.teku,
constants.CLIENT_TYPES.validator, constants.CLIENT_TYPES.validator,
# image, image,
cl_context.client_name, cl_context.client_name,
extra_labels, extra_labels,
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment