Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ethereum-package
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
ethereum-package
Commits
43edfd5a
Unverified
Commit
43edfd5a
authored
Oct 04, 2024
by
Barnabas Busa
Committed by
GitHub
Oct 04, 2024
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add supernode label to every container (#788)
parent
4d07aea8
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
119 additions
and
91 deletions
+119
-91
cl_context.star
src/cl/cl_context.star
+2
-0
grandine_launcher.star
src/cl/grandine/grandine_launcher.star
+7
-5
lighthouse_launcher.star
src/cl/lighthouse/lighthouse_launcher.star
+7
-5
lodestar_launcher.star
src/cl/lodestar/lodestar_launcher.star
+7
-5
nimbus_launcher.star
src/cl/nimbus/nimbus_launcher.star
+7
-5
prysm_launcher.star
src/cl/prysm/prysm_launcher.star
+7
-5
teku_launcher.star
src/cl/teku/teku_launcher.star
+7
-5
besu_launcher.star
src/el/besu/besu_launcher.star
+6
-5
erigon_launcher.star
src/el/erigon/erigon_launcher.star
+6
-5
ethereumjs_launcher.star
src/el/ethereumjs/ethereumjs_launcher.star
+6
-5
geth_launcher.star
src/el/geth/geth_launcher.star
+6
-5
nethermind_launcher.star
src/el/nethermind/nethermind_launcher.star
+6
-5
nimbus_launcher.star
src/el/nimbus-eth1/nimbus_launcher.star
+6
-5
reth_launcher.star
src/el/reth/reth_launcher.star
+6
-5
prometheus_launcher.star
src/prometheus/prometheus_launcher.star
+1
-0
shared_utils.star
src/shared_utils/shared_utils.star
+2
-1
lighthouse.star
src/vc/lighthouse.star
+6
-5
lodestar.star
src/vc/lodestar.star
+6
-5
nimbus.star
src/vc/nimbus.star
+6
-5
prysm.star
src/vc/prysm.star
+6
-5
teku.star
src/vc/teku.star
+6
-5
No files found.
src/cl/cl_context.star
View file @
43edfd5a
...
...
@@ -12,6 +12,7 @@ def new_cl_context(
snooper_enabled=False,
snooper_engine_context=None,
validator_keystore_files_artifact_uuid="",
supernode=False,
):
return struct(
client_name=client_name,
...
...
@@ -27,4 +28,5 @@ def new_cl_context(
snooper_enabled=snooper_enabled,
snooper_engine_context=snooper_engine_context,
validator_keystore_files_artifact_uuid=validator_keystore_files_artifact_uuid,
supernode=supernode,
)
src/cl/grandine/grandine_launcher.star
View file @
43edfd5a
...
...
@@ -120,6 +120,7 @@ def launch(
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
else "",
supernode=participant.supernode,
)
...
...
@@ -338,11 +339,12 @@ def get_beacon_config(
constants.HTTP_PORT_ID
),
"labels": shared_utils.label_maker(
constants.CL_TYPE.grandine,
constants.CLIENT_TYPES.cl,
participant.cl_image,
el_context.client_name,
participant.cl_extra_labels,
client=constants.CL_TYPE.grandine,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_image,
connected_client=el_context.client_name,
extra_labels=participant.cl_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/cl/lighthouse/lighthouse_launcher.star
View file @
43edfd5a
...
...
@@ -145,6 +145,7 @@ def launch(
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
else "",
supernode=participant.supernode,
)
...
...
@@ -336,11 +337,12 @@ def get_beacon_config(
constants.HTTP_PORT_ID
),
"labels": shared_utils.label_maker(
constants.CL_TYPE.lighthouse,
constants.CLIENT_TYPES.cl,
participant.cl_image,
el_context.client_name,
participant.cl_extra_labels,
client=constants.CL_TYPE.lighthouse,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_image,
connected_client=el_context.client_name,
extra_labels=participant.cl_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/cl/lodestar/lodestar_launcher.star
View file @
43edfd5a
...
...
@@ -140,6 +140,7 @@ def launch(
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
else "",
supernode=participant.supernode,
)
...
...
@@ -328,11 +329,12 @@ def get_beacon_config(
constants.HTTP_PORT_ID
),
"labels": shared_utils.label_maker(
constants.CL_TYPE.lodestar,
constants.CLIENT_TYPES.cl,
participant.cl_image,
el_context.client_name,
participant.cl_extra_labels,
client=constants.CL_TYPE.lodestar,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_image,
connected_client=el_context.client_name,
extra_labels=participant.cl_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/cl/nimbus/nimbus_launcher.star
View file @
43edfd5a
...
...
@@ -135,6 +135,7 @@ def launch(
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
else "",
supernode=participant.supernode,
)
...
...
@@ -317,11 +318,12 @@ def get_beacon_config(
constants.HTTP_PORT_ID
),
"labels": shared_utils.label_maker(
constants.CL_TYPE.nimbus,
constants.CLIENT_TYPES.cl,
participant.cl_image,
el_context.client_name,
participant.cl_extra_labels,
client=constants.CL_TYPE.nimbus,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_image,
connected_client=el_context.client_name,
extra_labels=participant.cl_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/cl/prysm/prysm_launcher.star
View file @
43edfd5a
...
...
@@ -122,6 +122,7 @@ def launch(
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
else "",
supernode=participant.supernode,
)
...
...
@@ -320,11 +321,12 @@ def get_beacon_config(
constants.HTTP_PORT_ID
),
"labels": shared_utils.label_maker(
constants.CL_TYPE.prysm,
constants.CLIENT_TYPES.cl,
participant.cl_image,
el_context.client_name,
participant.cl_extra_labels,
client=constants.CL_TYPE.prysm,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_image,
connected_client=el_context.client_name,
extra_labels=participant.cl_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/cl/teku/teku_launcher.star
View file @
43edfd5a
...
...
@@ -124,6 +124,7 @@ def launch(
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
else "",
supernode=participant.supernode,
)
...
...
@@ -358,11 +359,12 @@ def get_beacon_config(
constants.HTTP_PORT_ID
),
"labels": shared_utils.label_maker(
constants.CL_TYPE.teku,
constants.CLIENT_TYPES.cl,
participant.cl_image,
el_context.client_name,
participant.cl_extra_labels,
client=constants.CL_TYPE.teku,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_image,
connected_client=el_context.client_name,
extra_labels=participant.cl_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/el/besu/besu_launcher.star
View file @
43edfd5a
...
...
@@ -231,11 +231,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.besu,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.besu,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"user": User(uid=0, gid=0),
"tolerations": tolerations,
...
...
src/el/erigon/erigon_launcher.star
View file @
43edfd5a
...
...
@@ -228,11 +228,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.erigon,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.erigon,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/el/ethereumjs/ethereumjs_launcher.star
View file @
43edfd5a
...
...
@@ -214,11 +214,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.ethereumjs,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.ethereumjs,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/el/geth/geth_launcher.star
View file @
43edfd5a
...
...
@@ -310,11 +310,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.geth,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.geth,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/el/nethermind/nethermind_launcher.star
View file @
43edfd5a
...
...
@@ -221,11 +221,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.nethermind,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.nethermind,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/el/nimbus-eth1/nimbus_launcher.star
View file @
43edfd5a
...
...
@@ -206,11 +206,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.nimbus,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.nimbus,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/el/reth/reth_launcher.star
View file @
43edfd5a
...
...
@@ -224,11 +224,12 @@ def get_config(
"private_ip_address_placeholder": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.EL_TYPE.reth,
constants.CLIENT_TYPES.el,
participant.el_image,
cl_client_name,
participant.el_extra_labels,
client=constants.EL_TYPE.besu,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_image,
connected_client=cl_client_name,
extra_labels=participant.el_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/prometheus/prometheus_launcher.star
View file @
43edfd5a
...
...
@@ -100,6 +100,7 @@ def get_metrics_jobs(
"service": context.beacon_service_name,
"client_type": BEACON_CLIENT_TYPE,
"client_name": context.client_name,
"supernode": str(context.supernode),
}
additional_config = beacon_metrics_info[METRICS_INFO_ADDITIONAL_CONFIG_KEY]
if additional_config != None:
...
...
src/shared_utils/shared_utils.star
View file @
43edfd5a
...
...
@@ -70,7 +70,7 @@ def zfill_custom(value, width):
return ("0" * (width - len(str(value)))) + str(value)
def label_maker(client, client_type, image, connected_client, extra_labels):
def label_maker(client, client_type, image, connected_client, extra_labels
, supernode
):
# Extract sha256 hash if present
sha256 = ""
if "@sha256:" in image:
...
...
@@ -85,6 +85,7 @@ def label_maker(client, client_type, image, connected_client, extra_labels):
.split("@")[0], # drop the sha256 part of the image from the label
"ethereum-package.sha256": sha256,
"ethereum-package.connected-client": connected_client,
"ethereum-package.supernode": str(supernode),
}
# Add extra_labels to the labels dictionary
...
...
src/vc/lighthouse.star
View file @
43edfd5a
...
...
@@ -119,11 +119,12 @@ def get_config(
"files": files,
"env_vars": env,
"labels": shared_utils.label_maker(
constants.CL_TYPE.lighthouse,
constants.CLIENT_TYPES.validator,
image,
cl_context.client_name,
participant.vc_extra_labels,
client=constants.CL_TYPE.lighthouse,
client_type=constants.CLIENT_TYPES.validator,
image=image,
connected_client=cl_context.client_name,
extra_labels=participant.vc_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/vc/lodestar.star
View file @
43edfd5a
...
...
@@ -119,11 +119,12 @@ def get_config(
"files": files,
"env_vars": env_vars,
"labels": shared_utils.label_maker(
constants.CL_TYPE.lodestar,
constants.CLIENT_TYPES.validator,
image,
cl_context.client_name,
participant.vc_extra_labels,
client=constants.CL_TYPE.lodestar,
client_type=constants.CLIENT_TYPES.validator,
image=image,
connected_client=cl_context.client_name,
extra_labels=participant.vc_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/vc/nimbus.star
View file @
43edfd5a
...
...
@@ -92,11 +92,12 @@ def get_config(
"files": files,
"env_vars": participant.vc_extra_env_vars,
"labels": shared_utils.label_maker(
constants.CL_TYPE.nimbus,
constants.CLIENT_TYPES.validator,
image,
cl_context.client_name,
participant.vc_extra_labels,
client=constants.CL_TYPE.nimbus,
client_type=constants.CLIENT_TYPES.validator,
image=image,
connected_client=cl_context.client_name,
extra_labels=participant.vc_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/vc/prysm.star
View file @
43edfd5a
...
...
@@ -112,11 +112,12 @@ def get_config(
"files": files,
"env_vars": participant.vc_extra_env_vars,
"labels": shared_utils.label_maker(
constants.CL_TYPE.prysm,
constants.CLIENT_TYPES.validator,
image,
cl_context.client_name,
participant.vc_extra_labels,
client=constants.CL_TYPE.prysm,
client_type=constants.CLIENT_TYPES.validator,
image=image,
connected_client=cl_context.client_name,
extra_labels=participant.vc_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
src/vc/teku.star
View file @
43edfd5a
...
...
@@ -103,11 +103,12 @@ def get_config(
"files": files,
"env_vars": participant.vc_extra_env_vars,
"labels": shared_utils.label_maker(
constants.CL_TYPE.teku,
constants.CLIENT_TYPES.validator,
image,
cl_context.client_name,
participant.vc_extra_labels,
client=constants.CL_TYPE.teku,
client_type=constants.CLIENT_TYPES.validator,
image=image,
connected_client=cl_context.client_name,
extra_labels=participant.vc_extra_labels,
supernode=participant.supernode,
),
"tolerations": tolerations,
"node_selectors": node_selectors,
...
...
vicotor
@luxueqian
mentioned in commit
861cf2ec
·
Apr 13, 2025
mentioned in commit
861cf2ec
mentioned in commit 861cf2ec532efe6cc2496f53af192826607e7524
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment