feat: add geth and nethermind nodes to heze-devnet-3

ansible/inventories/devnet-3/group_vars/all/images.yaml

@@ -9,9 +9,9 @@ default_ethereum_client_images:
   grandine: ethpandaops/grandine:develop
   ### Execution layer clients
   besu: ethpandaops/besu:heze-devnet-2
-  geth: ethpandaops/geth:heze-devnet-2
+  geth: ethpandaops/geth:heze-devnet-3
   erigon: erigontech/erigon:main-latest
-  nethermind: ethpandaops/nethermind:heze-devnet-2
+  nethermind: ethpandaops/nethermind:heze-devnet-3
   reth: ethpandaops/reth:heze-devnet-2
   nimbusel: ethpandaops/nimbus-eth1:master
   ethrex: ethpandaops/ethrex:heze-devnet-3

ansible/inventories/devnet-3/inventory.ini

@@ -13,41 +13,81 @@ buildoor-lodestar-ethrex-1 ansible_host=170.64.145.68 ipv6=2400:6180:10:200::eef
 lighthouse-ethrex-1 ansible_host=138.197.178.122 ipv6=2a03:b0c0:3:f0:0:3:2870:c000 cloud=digitalocean cloud_region=fra1 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=800 validator_end=1000
 lighthouse-ethrex-2 ansible_host=137.184.170.241 ipv6=2604:a880:cad:d0:0:1:c1da:f001 cloud=digitalocean cloud_region=tor1 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=1000 validator_end=1200
 
+[lighthouse_geth]
+lighthouse-geth-1 ansible_host=143.110.223.221 ipv6=2604:a880:cad:d0:0:1:c2aa:c001 cloud=digitalocean cloud_region=tor1 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=2000 validator_end=2100
+
+[lighthouse_nethermind]
+lighthouse-nethermind-1 ansible_host=134.122.50.150 ipv6=2a03:b0c0:2:f0:0:2:2a6c:c001 cloud=digitalocean cloud_region=ams3 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=2100 validator_end=2200
+
 [lodestar_ethrex]
 lodestar-ethrex-1 ansible_host=209.38.82.144 ipv6=2400:6180:10:200::eefb:e000 cloud=digitalocean cloud_region=syd1 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=400 validator_end=600
 lodestar-ethrex-2 ansible_host=168.144.119.163 ipv6=2400:6180:100:d0:0:1:aea8:9001 cloud=digitalocean cloud_region=blr1 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=600 validator_end=800
 
+[lodestar_geth]
+lodestar-geth-1 ansible_host=157.245.217.52 ipv6=2604:a880:800:14:0:3:ba62:3000 cloud=digitalocean cloud_region=nyc3 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=1800 validator_end=1900
+
+[lodestar_nethermind]
+lodestar-nethermind-1 ansible_host=168.144.187.183 ipv6=2400:6180:100:d0:0:1:affb:8001 cloud=digitalocean cloud_region=blr1 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=1900 validator_end=2000
+
 [prysm_ethrex]
 prysm-ethrex-1 ansible_host=134.209.90.44 ipv6=2a03:b0c0:2:f0:0:2:28b6:3001 cloud=digitalocean cloud_region=ams3 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=1200 validator_end=1400
 prysm-ethrex-2 ansible_host=159.65.177.201 ipv6=2604:a880:800:14:0:3:b835:e000 cloud=digitalocean cloud_region=nyc3 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=1400 validator_end=1600
 
+[prysm_geth]
+prysm-geth-1 ansible_host=157.245.198.20 ipv6=2400:6180:0:d2:0:3:44af:d000 cloud=digitalocean cloud_region=sgp1 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=2200 validator_end=2300
+
+[prysm_nethermind]
+prysm-nethermind-1 ansible_host=134.199.214.149 ipv6=2604:a880:4:1d0:0:3:c629:f000 cloud=digitalocean cloud_region=sfo3 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=2300 validator_end=2400
+
 [teku_ethrex]
 teku-ethrex-1 ansible_host=168.144.148.19 ipv6=2400:6180:100:d0:0:1:aea8:a001 cloud=digitalocean cloud_region=blr1 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=0 validator_end=200
 teku-ethrex-2 ansible_host=138.197.45.75 ipv6=2604:a880:800:14:0:3:b835:f000 cloud=digitalocean cloud_region=nyc3 arch=amd64 ethereum_node_cl_supernode_enabled=True validator_start=200 validator_end=400
 
+[teku_geth]
+teku-geth-1 ansible_host=167.71.87.174 ipv6=2604:a880:800:14:0:3:ba62:2000 cloud=digitalocean cloud_region=nyc3 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=1600 validator_end=1700
+
+[teku_nethermind]
+teku-nethermind-1 ansible_host=209.38.240.118 ipv6=2a03:b0c0:3:f0:0:3:2a7a:8000 cloud=digitalocean cloud_region=fra1 arch=amd64 ethereum_node_cl_supernode_enabled=False validator_start=1700 validator_end=1800
+
 
 [lighthouse_reth]
 
 # Consensus client groups
 
 [lighthouse:children]
 lighthouse_ethrex
+lighthouse_geth
+lighthouse_nethermind
 [lodestar:children]
 buildoor_lodestar_ethrex
 lodestar_ethrex
+lodestar_geth
+lodestar_nethermind
 [nimbus:children]
 [teku:children]
 teku_ethrex
+teku_geth
+teku_nethermind
 [prysm:children]
 prysm_ethrex
+prysm_geth
+prysm_nethermind
 [grandine:children]
 
 # Execution client groups
 
 [besu:children]
 [ethereumjs:children]
 [geth:children]
+lighthouse_geth
+lodestar_geth
+prysm_geth
+teku_geth
 [nethermind:children]
+lighthouse_nethermind
+lodestar_nethermind
+prysm_nethermind
+teku_nethermind
 [erigon:children]
 [reth:children]
 [nimbusel:children]
@@ -80,6 +120,8 @@ buildoor
 
 [execution_node:children]
 ethrex
+geth
+nethermind
 buildoor
 
 [ethereum_node:children]

kubernetes/devnet-3/assertoor/values.yaml

@@ -49,24 +49,48 @@ assertoor:
     - name:  lighthouse-ethrex-2
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lighthouse-ethrex-2.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lighthouse-ethrex-2.srv.heze-devnet-3.ethpandaops.io
+    - name:  lighthouse-geth-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lighthouse-geth-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lighthouse-geth-1.srv.heze-devnet-3.ethpandaops.io
+    - name:  lighthouse-nethermind-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lighthouse-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lighthouse-nethermind-1.srv.heze-devnet-3.ethpandaops.io
     - name:  lodestar-ethrex-1
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lodestar-ethrex-1.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-ethrex-1.srv.heze-devnet-3.ethpandaops.io
     - name:  lodestar-ethrex-2
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lodestar-ethrex-2.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-ethrex-2.srv.heze-devnet-3.ethpandaops.io
+    - name:  lodestar-geth-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lodestar-geth-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-geth-1.srv.heze-devnet-3.ethpandaops.io
+    - name:  lodestar-nethermind-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-lodestar-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-nethermind-1.srv.heze-devnet-3.ethpandaops.io
     - name:  prysm-ethrex-1
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-prysm-ethrex-1.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-ethrex-1.srv.heze-devnet-3.ethpandaops.io
     - name:  prysm-ethrex-2
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-prysm-ethrex-2.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-ethrex-2.srv.heze-devnet-3.ethpandaops.io
+    - name:  prysm-geth-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-prysm-geth-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-geth-1.srv.heze-devnet-3.ethpandaops.io
+    - name:  prysm-nethermind-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-prysm-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-nethermind-1.srv.heze-devnet-3.ethpandaops.io
     - name:  teku-ethrex-1
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-teku-ethrex-1.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-ethrex-1.srv.heze-devnet-3.ethpandaops.io
     - name:  teku-ethrex-2
       executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-teku-ethrex-2.srv.heze-devnet-3.ethpandaops.io
       consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-ethrex-2.srv.heze-devnet-3.ethpandaops.io
+    - name:  teku-geth-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-teku-geth-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-geth-1.srv.heze-devnet-3.ethpandaops.io
+    - name:  teku-nethermind-1
+      executionUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@rpc-teku-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+      consensusUrl: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-nethermind-1.srv.heze-devnet-3.ethpandaops.io
 
   validatorNamesInventory: https://config.heze-devnet-3.ethpandaops.io/api/v1/nodes/validator-ranges
   globalVariables:
@@ -76,19 +100,35 @@ assertoor:
       - buildoor-lodestar-ethrex-1
       - lighthouse-ethrex-1
       - lighthouse-ethrex-2
+      - lighthouse-geth-1
+      - lighthouse-nethermind-1
       - lodestar-ethrex-1
       - lodestar-ethrex-2
+      - lodestar-geth-1
+      - lodestar-nethermind-1
       - prysm-ethrex-1
       - prysm-ethrex-2
+      - prysm-geth-1
+      - prysm-nethermind-1
       - teku-ethrex-1
       - teku-ethrex-2
+      - teku-geth-1
+      - teku-nethermind-1
     validatorPairNames:
       - lighthouse-ethrex-1
       - lighthouse-ethrex-2
+      - lighthouse-geth-1
+      - lighthouse-nethermind-1
       - lodestar-ethrex-1
       - lodestar-ethrex-2
+      - lodestar-geth-1
+      - lodestar-nethermind-1
       - prysm-ethrex-1
       - prysm-ethrex-2
+      - prysm-geth-1
+      - prysm-nethermind-1
       - teku-ethrex-2
+      - teku-geth-1
+      - teku-nethermind-1
 
   assertoorTests: []

kubernetes/devnet-3/checkpointz/values.yaml

@@ -62,21 +62,45 @@ checkpointz:
         - name: lighthouse-ethrex-2
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lighthouse-ethrex-2.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
+        - name: lighthouse-geth-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lighthouse-geth-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
+        - name: lighthouse-nethermind-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lighthouse-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
         - name: lodestar-ethrex-1
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-ethrex-1.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
         - name: lodestar-ethrex-2
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-ethrex-2.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
+        - name: lodestar-geth-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-geth-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
+        - name: lodestar-nethermind-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-lodestar-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
         - name: prysm-ethrex-1
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-ethrex-1.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
         - name: prysm-ethrex-2
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-ethrex-2.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
+        - name: prysm-geth-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-geth-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
+        - name: prysm-nethermind-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-prysm-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
         - name: teku-ethrex-1
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-ethrex-1.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
         - name: teku-ethrex-2
           address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-ethrex-2.srv.heze-devnet-3.ethpandaops.io
           dataProvider: true
+        - name: teku-geth-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-geth-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true
+        - name: teku-nethermind-1
+          address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.heze-devnets.node_ingress.combined}>@bn-teku-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+          dataProvider: true

kubernetes/devnet-3/dora/endpoints-cl.yaml

@@ -19,6 +19,16 @@
   authGroup: pandaops
   priority: -1
   archive: true
+- url: https://bn-lighthouse-geth-1.srv.heze-devnet-3.ethpandaops.io
+  name: lighthouse-geth-1
+  authGroup: pandaops
+  priority: -1
+  archive: true
+- url: https://bn-lighthouse-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+  name: lighthouse-nethermind-1
+  authGroup: pandaops
+  priority: -1
+  archive: true
 - url: https://bn-lodestar-ethrex-1.srv.heze-devnet-3.ethpandaops.io
   name: lodestar-ethrex-1
   authGroup: pandaops
@@ -27,6 +37,14 @@
   name: lodestar-ethrex-2
   authGroup: pandaops
   priority: -1
+- url: https://bn-lodestar-geth-1.srv.heze-devnet-3.ethpandaops.io
+  name: lodestar-geth-1
+  authGroup: pandaops
+  priority: -1
+- url: https://bn-lodestar-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+  name: lodestar-nethermind-1
+  authGroup: pandaops
+  priority: -1
 - url: https://bn-prysm-ethrex-1.srv.heze-devnet-3.ethpandaops.io
   name: prysm-ethrex-1
   authGroup: pandaops
@@ -35,6 +53,14 @@
   name: prysm-ethrex-2
   authGroup: pandaops
   priority: -1
+- url: https://bn-prysm-geth-1.srv.heze-devnet-3.ethpandaops.io
+  name: prysm-geth-1
+  authGroup: pandaops
+  priority: -1
+- url: https://bn-prysm-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+  name: prysm-nethermind-1
+  authGroup: pandaops
+  priority: -1
 - url: https://bn-teku-ethrex-1.srv.heze-devnet-3.ethpandaops.io
   name: teku-ethrex-1
   authGroup: pandaops
@@ -43,4 +69,12 @@
   name: teku-ethrex-2
   authGroup: pandaops
   priority: -1
+- url: https://bn-teku-geth-1.srv.heze-devnet-3.ethpandaops.io
+  name: teku-geth-1
+  authGroup: pandaops
+  priority: -1
+- url: https://bn-teku-nethermind-1.srv.heze-devnet-3.ethpandaops.io
+  name: teku-nethermind-1
+  authGroup: pandaops
+  priority: -1