fix(ethereum): right number of ports when using lighthouse (#1276)

Author: cjorge-graphops

arbitrum/helmfile.yaml

@@ -1,5 +1,5 @@
 #namespace defaults
-{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"one","one":{"targetNamespace":"arbitrum-one","scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"features":["proxyd-classic","proxyd-nitro","arbitrum-classic","arbitrum-nitro"]},"common":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}}},"sepolia":{"targetNamespace":"arbitrum-sepolia","scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"features":["proxyd-nitro","arbitrum-nitro"]}}` | fromJson ) }}
+{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}}},"flavor":"one","one":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"targetNamespace":"arbitrum-one","features":["proxyd-classic","proxyd-nitro","arbitrum-classic","arbitrum-nitro"]},"sepolia":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"targetNamespace":"arbitrum-sepolia","features":["proxyd-nitro","arbitrum-nitro"]}}` | fromJson ) }}
 #set default flavor when missing
 {{ if not ( hasKey .Values "flavor" ) }}
 {{ $_ := set .Values "flavor" "one" }}
@@ -155,8 +155,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   arbitrum-nitro:
     {{- if ( .Values | get "arbitrum-nitro" dict | get "chartUrl" false ) }}

celo/helmfile.yaml

@@ -1,5 +1,5 @@
 #namespace defaults
-{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"celo-mainnet","features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"alfajores":{"targetNamespace":"celo-alfajores","features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"common":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"baklava":{"targetNamespace":"celo-baklava","features":["proxyd"],"scaling":{"deployments":1,"celo":{}}}}` | fromJson ) }}
+{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"flavor":"mainnet","mainnet":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}},"targetNamespace":"celo-mainnet"},"alfajores":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}},"targetNamespace":"celo-alfajores"},"baklava":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}},"targetNamespace":"celo-baklava"}}` | fromJson ) }}
 #set default flavor when missing
 {{ if not ( hasKey .Values "flavor" ) }}
 {{ $_ := set .Values "flavor" "mainnet" }}
@@ -155,8 +155,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   celo:
     {{- if ( .Values | get "celo" dict | get "chartUrl" false ) }}

ethereum/helmfile.yaml

@@ -1,5 +1,5 @@
 #namespace defaults
-{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"eth-mainnet","features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}}},"holesky":{"targetNamespace":"eth-holesky","features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}}},"common":{"features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}}},"sepolia":{"targetNamespace":"eth-sepolia","features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}}}}` | fromJson ) }}
+{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}}},"flavor":"mainnet","mainnet":{"features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}},"targetNamespace":"eth-mainnet"},"holesky":{"features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}},"targetNamespace":"eth-holesky"},"sepolia":{"features":["proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{},"lighthouse":{}},"targetNamespace":"eth-sepolia"}}` | fromJson ) }}
 #set default flavor when missing
 {{ if not ( hasKey .Values "flavor" ) }}
 {{ $_ := set .Values "flavor" "mainnet" }}
@@ -155,8 +155,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   erigon:
     {{- if ( .Values | get "erigon" dict | get "chartUrl" false ) }}

ethereum/values/_common/erigon.yaml.gotmpl

@@ -139,7 +139,7 @@ statefulNode:
 {{- if (hasKey .Values.scaling "p2pStartPort") }}
   p2pNodePort:
     enabled: true
-    port: {{ add (mul (sub $scalingIndex 1) 2) .Values.scaling.p2pStartPort }}
+    port: {{ add (mul (sub $scalingIndex 1) 3) .Values.scaling.p2pStartPort }}
 {{- end }}
 
 rpcdaemon:

gnosis/helmfile.yaml

@@ -1,5 +1,5 @@
 #namespace defaults
-{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"gnosis-mainnet","features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}},"common":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}},"chiado":{"targetNamespace":"gnosis-chiado","features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}}}` | fromJson ) }}
+{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}},"flavor":"mainnet","mainnet":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}},"targetNamespace":"gnosis-mainnet"},"chiado":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}},"targetNamespace":"gnosis-chiado"}}` | fromJson ) }}
 #set default flavor when missing
 {{ if not ( hasKey .Values "flavor" ) }}
 {{ $_ := set .Values "flavor" "mainnet" }}
@@ -155,8 +155,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   erigon:
     {{- if ( .Values | get "erigon" dict | get "chartUrl" false ) }}

graph/helmfile.yaml

@@ -1,5 +1,5 @@
 #namespace defaults
-{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"arbitrum-one","arbitrum-one":{"targetNamespace":"graph-arbitrum-one","features":["node","network-indexer","toolbox","database","subgraph-radio"]},"common":{"features":["node","network-indexer","toolbox","database","subgraph-radio"]},"arbitrum-sepolia":{"targetNamespace":"graph-arbitrum-sepolia","features":["node","network-indexer","toolbox","database","subgraph-radio"]}}` | fromJson ) }}
+{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["node","network-indexer","toolbox","database","subgraph-radio"]},"flavor":"arbitrum-one","arbitrum-one":{"features":["node","network-indexer","toolbox","database","subgraph-radio"],"targetNamespace":"graph-arbitrum-one"},"arbitrum-sepolia":{"features":["node","network-indexer","toolbox","database","subgraph-radio"],"targetNamespace":"graph-arbitrum-sepolia"}}` | fromJson ) }}
 #set default flavor when missing
 {{ if not ( hasKey .Values "flavor" ) }}
 {{ $_ := set .Values "flavor" "arbitrum-one" }}
@@ -143,8 +143,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   graph-node:
     {{- if ( .Values | get "graph-node" dict | get "chartUrl" false ) }}

ingress/helmfile.yaml

@@ -143,8 +143,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   ingress-nginx:
     {{- if ( .Values | get "ingress-nginx" dict | get "chartUrl" false ) }}

monitoring/helmfile.yaml

@@ -143,8 +143,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   kube-prometheus-stack:
     {{- if ( .Values | get "kube-prometheus-stack" dict | get "chartUrl" false ) }}

polygon/helmfile.yaml

@@ -1,5 +1,5 @@
 #namespace defaults
-{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"polygon-mainnet","features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}},"common":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}},"amoy":{"targetNamespace":"polygon-amoy","features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}}}` | fromJson ) }}
+{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}},"flavor":"mainnet","mainnet":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}},"targetNamespace":"polygon-mainnet"},"amoy":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}},"targetNamespace":"polygon-amoy"}}` | fromJson ) }}
 #set default flavor when missing
 {{ if not ( hasKey .Values "flavor" ) }}
 {{ $_ := set .Values "flavor" "mainnet" }}
@@ -155,8 +155,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   erigon:
     {{- if ( .Values | get "erigon" dict | get "chartUrl" false ) }}

postgres-operator/helmfile.yaml

@@ -134,8 +134,8 @@ repositories:
 
 templates:
   defaults:
-    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
     missingFileHandler: Warn
+    namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}'
 
   postgres-operator:
     {{- if ( .Values | get "postgres-operator" dict | get "chartUrl" false ) }}