feat(deps)!: release erigon v3 (#509)

This is a breaking change and will require a re-sync, the good news is initial syncs are faster.
Erigon v3 also defaults to using internal CL when available (Caplin), and that's recommended.

Erigon v2 is officially discontinued and is not supported for Pectra, so everyone is advised to upgrade ahead of time (Pectra upgrade is scheduled for end of April)

| datasource | package           | from    | to     |
| ---------- | ----------------- | ------- | ------ |
| docker     | erigontech/erigon | v2.61.3 | v3.0.0 |

---------

Co-authored-by: graphops-renovate[bot] <135047802+graphops-renovate[bot]@users.noreply.github.com>
Co-authored-by: Carlos Jorge <carlos@graphops.xyz>

Author: graphops-renovate[bot]

charts/erigon/Chart.yaml

@@ -15,11 +15,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.14
+version: 0.11.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # renovate: image=erigontech/erigon
-appVersion: "v2.61.3"
+appVersion: "v3.0.0"

charts/erigon/README.md

@@ -2,7 +2,7 @@
 
 Deploy and scale [Erigon](https://github.com/ledgerwatch/erigon) inside Kubernetes with ease
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.10.14](https://img.shields.io/badge/Version-0.10.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.61.3](https://img.shields.io/badge/AppVersion-v2.61.3-informational?style=flat-square)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.0.0](https://img.shields.io/badge/AppVersion-v3.0.0-informational?style=flat-square)
 
 ## Features
 
@@ -160,6 +160,16 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | serviceAccount.name | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | string | `""` |
  | statefulNode.affinity |  | object | `{}` |
  | statefulNode.affinityPresets.antiAffinityByHostname | Configure anti-affinity rules to prevent multiple Erigon instances on the same host | bool | `true` |
+ | statefulNode.beaconApi | Beacon API configuration for erigon3 | object | `{"addr":"0.0.0.0","api":"beacon,builder,config,debug,events,node,lighthouse","blobsArchive":true,"blobsNoPruning":true,"blocksArchive":true,"corsAllowMethods":"*","corsAllowOrigins":"*","enabled":true,"port":5555}` |
+ | statefulNode.beaconApi.addr | Beacon API address to bind to | string | `"0.0.0.0"` |
+ | statefulNode.beaconApi.api | Comma-separated list of API namespaces to enable | string | `"beacon,builder,config,debug,events,node,lighthouse"` |
+ | statefulNode.beaconApi.blobsArchive | Enable blobs archive | bool | `true` |
+ | statefulNode.beaconApi.blobsNoPruning | Disable blobs pruning | bool | `true` |
+ | statefulNode.beaconApi.blocksArchive | Enable blocks archive | bool | `true` |
+ | statefulNode.beaconApi.corsAllowMethods | CORS allow methods | string | `"*"` |
+ | statefulNode.beaconApi.corsAllowOrigins | CORS allow origins | string | `"*"` |
+ | statefulNode.beaconApi.enabled | Enable Beacon API | bool | `true` |
+ | statefulNode.beaconApi.port | Beacon API port to expose | int | `5555` |
  | statefulNode.datadir | The path to the Erigon data directory | string | `"/storage"` |
  | statefulNode.extraArgs | Additional CLI arguments to pass to `erigon` | list | `[]` |
  | statefulNode.extraContainers | Additional containers to inject to this graph node group - an array of Container objects | list | `[]` |
@@ -176,15 +186,15 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | statefulNode.p2pNodePort.initContainer.image.pullPolicy | Container pull policy | string | `"IfNotPresent"` |
  | statefulNode.p2pNodePort.initContainer.image.repository | Container image to fetch nodeport information | string | `"lachlanevenson/k8s-kubectl"` |
  | statefulNode.p2pNodePort.initContainer.image.tag | Container tag | string | `"v1.25.4"` |
- | statefulNode.p2pNodePort.port | NodePort to be used. Must be unique. | int | `31000` |
+ | statefulNode.p2pNodePort.port | Start NodePort to be used in a range (2 ports for protocol versions 68 and 67). Must be unique. | int | `31000` |
  | statefulNode.podAnnotations | Annotations for the `Pod` | object | `{}` |
  | statefulNode.podSecurityContext | Pod-wide security context | object | `{"fsGroup":1000,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` |
+ | statefulNode.pruneMode | Sets the pruning mode to use (archive, validator, full) | string | `"archive"` |
  | statefulNode.readinessProbe | Sets a readinessProbe configuration for the container | object | `{}` |
  | statefulNode.resources |  | object | `{}` |
- | statefulNode.restoreSnapshot.enabled | Enable initialising Erigon state from a remote snapshot | bool | `false` |
- | statefulNode.restoreSnapshot.snapshotUrl | URL for snapshot to download and extract to restore state | string | `""` |
  | statefulNode.rollingUpdatePartition | When using a RollingUpdate update strategy in the StatefulSet, sets a partition index to only update PODs with that index or higher | int | `0` |
  | statefulNode.service.ports.grpc-erigon | Service Port to expose Erigon GRPC interface on | int | `9090` |
+ | statefulNode.service.ports.http-beaconapi | Service Port to expose Beacon API interface on | int | `5555` |
  | statefulNode.service.ports.http-engineapi | Service Port to expose engineAPI interface on | int | `8551` |
  | statefulNode.service.ports.http-jsonrpc | Service Port to expose JSON-RPC interface on | int | `8545` |
  | statefulNode.service.ports.http-metrics | Service Port to expose Prometheus metrics on | int | `6060` |

charts/erigon3/README.md renamed to charts/erigon/README.md.orig

@@ -1,8 +1,8 @@
-# Erigon3 Helm Chart
+# Erigon Helm Chart
 
-Deploy and scale [Erigon3](https://github.com/ledgerwatch/erigon) inside Kubernetes with ease
+Deploy and scale [Erigon](https://github.com/ledgerwatch/erigon) inside Kubernetes with ease
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.0.1-canary.1](https://img.shields.io/badge/Version-0.0.1--canary.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.0.0](https://img.shields.io/badge/AppVersion-v3.0.0-informational?style=flat-square)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.10.10](https://img.shields.io/badge/Version-0.10.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.60.10](https://img.shields.io/badge/AppVersion-v2.60.10-informational?style=flat-square)
 
 ## Features
 
@@ -13,15 +13,14 @@ Deploy and scale [Erigon3](https://github.com/ledgerwatch/erigon) inside Kuberne
 - Support for `ServiceMonitor`s to configure Prometheus to scrape metrics ([prometheus-operator](https://github.com/prometheus-operator/prometheus-operator))
 - Support for configuring Grafana dashboards for Erigon ([grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana))
 - Support for exposing a NodePort to enable inbound P2P dials for better peering
-- Support for Beacon API with configurable options for blocks and blobs archiving
 
 ## Quickstart
 
 To install the chart with the release name `my-release`:
 
 ```console
 $ helm repo add graphops http://graphops.github.io/launchpad-charts
-$ helm install my-release graphops/erigon3
+$ helm install my-release graphops/erigon
 ```
 
 Once the release is installed, Erigon will begin syncing. You can use `kubectl logs` to monitor the sync status. See the Values section to install Prometheus `ServiceMonitor`s and a Grafana dashboard.
@@ -89,6 +88,24 @@ statefulNode:
     port: 31000 # Must be globally unique and available on the host
 ```
 
+## Restoring chaindata from a snapshot
+
+You can specify a snapshot URL that will be used to restore Erigon's `chaindata` state. When enabled, an init container will perform a streaming extraction of the snapshot into storage. The snapshot should be a gzipped tarball of `chaindata`.
+
+Example:
+```yaml
+# values.yaml
+
+statefulNode:
+  restoreSnapshot:
+    enable: true
+    snapshotUrl: https://matic-blockchain-snapshots.s3-accelerate.amazonaws.com/matic-mainnet/erigon-archive-snapshot-2022-07-15.tar.gz
+```
+
+Once Erigon's state has been restored, the snapshot URL will be saved to storage at `/from_snapshot`. Any time the Erigon Pod starts, as long as the snapshot configuration has not changed, Erigon will boot with the existing state. If you modify the snapshot configuration, the init container will remove existing chaindata and restore state again.
+
+You can monitor progress by following the logs of the `stateful-node-init` container: `kubectl logs --since 1m -f release-name-stateful-node-0 -c stateful-node-init`
+
 ## Upgrading
 
 We recommend that you pin the version of the Chart that you deploy. You can use the `--version` flag with `helm install` and `helm upgrade` to specify a chart version constraint.
@@ -130,7 +147,7 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | rpcdaemon.extraLabels | Extra labels to attach to the Pod for matching against | object | `{}` |
  | rpcdaemon.nodeSelector |  | object | `{}` |
  | rpcdaemon.podAnnotations | Annotations for the `Pod` | object | `{}` |
- | rpcdaemon.podSecurityContext | Pod-wide security context | object | `{"fsGroup":1000,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` |
+ | rpcdaemon.podSecurityContext | Pod-wide security context | object | `{"fsGroup":101337,"runAsGroup":101337,"runAsNonRoot":true,"runAsUser":101337}` |
  | rpcdaemon.replicaCount | Number of replicas to run | int | `2` |
  | rpcdaemon.resources.limits |  | object | `{}` |
  | rpcdaemon.resources.requests | Requests must be specified if you are using autoscaling | object | `{"cpu":"500m","memory":"4Gi"}` |
@@ -143,17 +160,6 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | serviceAccount.name | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | string | `""` |
  | statefulNode.affinity |  | object | `{}` |
  | statefulNode.affinityPresets.antiAffinityByHostname | Configure anti-affinity rules to prevent multiple Erigon instances on the same host | bool | `true` |
- | statefulNode.beaconApi | Beacon API configuration for erigon3 | object | `{"addr":"0.0.0.0","api":"beacon,builder,config,debug,events,node,lighthouse","blobsArchive":true,"blobsNoPruning":true,"blocksArchive":true,"corsAllowMethods":"*","corsAllowOrigins":"*","enabled":false,"port":5555}` |
- | statefulNode.beaconApi.addr | Beacon API address to bind to | string | `"0.0.0.0"` |
- | statefulNode.beaconApi.api | Comma-separated list of API namespaces to enable | string | `"beacon,builder,config,debug,events,node,lighthouse"` |
- | statefulNode.beaconApi.blobsArchive | Enable blobs archive | bool | `true` |
- | statefulNode.beaconApi.blobsNoPruning | Disable blobs pruning | bool | `true` |
- | statefulNode.beaconApi.blocksArchive | Enable blocks archive | bool | `true` |
- | statefulNode.beaconApi.corsAllowMethods | CORS allow methods | string | `"*"` |
- | statefulNode.beaconApi.corsAllowOrigins | CORS allow origins | string | `"*"` |
- | statefulNode.beaconApi.enabled | Enable Beacon API | bool | `false` |
- | statefulNode.beaconApi.port | Beacon API port to expose | int | `5555` |
- | statefulNode.datadir | The path to the Erigon data directory | string | `"/storage"` |
  | statefulNode.extraArgs | Additional CLI arguments to pass to `erigon` | list | `[]` |
  | statefulNode.extraContainers | Additional containers to inject to this graph node group - an array of Container objects | list | `[]` |
  | statefulNode.extraInitContainers | Additional init containers to inject to this graph node group - an array of Container objects | list | `[]` |
@@ -171,20 +177,25 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | statefulNode.p2pNodePort.initContainer.image.tag | Container tag | string | `"v1.25.4"` |
  | statefulNode.p2pNodePort.port | NodePort to be used. Must be unique. | int | `31000` |
  | statefulNode.podAnnotations | Annotations for the `Pod` | object | `{}` |
- | statefulNode.podSecurityContext | Pod-wide security context | object | `{"fsGroup":1000,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` |
- | statefulNode.pruneMode | Sets the pruning mode to use (archive, validator, full) | string | `"archive"` |
+ | statefulNode.podSecurityContext | Pod-wide security context | object | `{"fsGroup":101337,"runAsGroup":101337,"runAsNonRoot":true,"runAsUser":101337}` |
  | statefulNode.readinessProbe | Sets a readinessProbe configuration for the container | object | `{}` |
  | statefulNode.resources |  | object | `{}` |
+ | statefulNode.restoreSnapshot.enabled | Enable initialising Erigon state from a remote snapshot | bool | `false` |
+ | statefulNode.restoreSnapshot.snapshotUrl | URL for snapshot to download and extract to restore state | string | `""` |
  | statefulNode.rollingUpdatePartition | When using a RollingUpdate update strategy in the StatefulSet, sets a partition index to only update PODs with that index or higher | int | `0` |
  | statefulNode.service.ports.grpc-erigon | Service Port to expose Erigon GRPC interface on | int | `9090` |
- | statefulNode.service.ports.http-beaconapi | Service Port to expose Beacon API interface on | int | `5555` |
  | statefulNode.service.ports.http-engineapi | Service Port to expose engineAPI interface on | int | `8551` |
  | statefulNode.service.ports.http-jsonrpc | Service Port to expose JSON-RPC interface on | int | `8545` |
  | statefulNode.service.ports.http-metrics | Service Port to expose Prometheus metrics on | int | `6060` |
  | statefulNode.service.ports.ws-rpc | Service Port to expose WS-RPC interface on | int | `8546` |
+<<<<<<< HEAD
  | statefulNode.service.publishNotReadyAddresses.headless | Toggle publishing not ready addresses for headless service | bool | `false` |
  | statefulNode.service.publishNotReadyAddresses.p2p | Toggle publishing not ready addresses for p2p service | bool | `false` |
  | statefulNode.service.topologyAwareRouting.enabled | Toggle for topology aware routing | bool | `false` |
+=======
+ | statefulNode.service.publishNotReadyAddresses | Toggle publishing not ready addresses for headless and p2p services | object | `{"headless":false,"p2p":false}` |
+ | statefulNode.service.topologyAwareRouting | Toggle for topology aware routing | object | `{"enabled":false}` |
+>>>>>>> b9a8fe9 (feat: add publishNotReadyAddresses toggle)
  | statefulNode.service.type |  | string | `"ClusterIP"` |
  | statefulNode.startupProbe | Sets a startupProbe configuration for the container | object | `{}` |
  | statefulNode.terminationGracePeriodSeconds | Amount of time to wait before force-killing the Erigon process | int | `60` |

charts/erigon/templates/stateful-node/service.yaml

@@ -67,16 +67,26 @@ spec:
   externalTrafficPolicy: Local
   publishNotReadyAddresses: {{ default false $values.service.publishNotReadyAddresses.p2p }}
   ports:
-    - name: tcp-p2p
+    - name: tcp-p2p-68
       port: {{ include "erigon.p2pPort" $values }}
       protocol: TCP
-      targetPort: tcp-p2p
+      targetPort: tcp-p2p-68
       nodePort: {{ $port }}
-    - name: udp-p2p
+    - name: udp-p2p-68
       port: {{ include "erigon.p2pPort" $values }}
       protocol: UDP
-      targetPort: udp-p2p
+      targetPort: udp-p2p-68
       nodePort: {{ $port }}
+    - name: tcp-p2p-67
+      port: {{ add (include "erigon.p2pPort" $values) 1 }}
+      protocol: TCP
+      targetPort: tcp-p2p-67
+      nodePort: {{ add $port 1 }}
+    - name: udp-p2p-67
+      port: {{ add (include "erigon.p2pPort" $values) 1 }}
+      protocol: UDP
+      targetPort: udp-p2p-67
+      nodePort: {{ add $port 1 }}
   selector:
     {{- include "erigon.selectorLabels" . | nindent 4 }}
     statefulset.kubernetes.io/pod-name: "{{ include "erigon.fullname" $ }}-{{ $componentName }}-0"

charts/erigon3/templates/stateful-node/service.yaml renamed to charts/erigon/templates/stateful-node/service.yaml.orig

@@ -1,16 +1,22 @@
 {{- $values := $.Values.statefulNode }}
 {{- $componentName := "stateful-node" }}
-{{- $componentLabel := include "erigon3.componentLabelFor" $componentName }}
+{{- $componentLabel := include "erigon.componentLabelFor" $componentName }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "erigon3.fullname" . }}-{{ $componentName }}-headless
+  name: {{ include "erigon.fullname" . }}-{{ $componentName }}-headless
   labels:
-    {{- include "erigon3.labels" . | nindent 4 }}
+    {{- include "erigon.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
 spec:
   clusterIP: None # Headless service
+<<<<<<< HEAD
+  # Allow the P2P Service to forward traffic even if the POD is not Ready
+  # Usefull for ReadinessProbes that require synced state
+  publishNotReadyAddresses: true
+=======
   publishNotReadyAddresses: {{ default false $values.service.publishNotReadyAddresses.headless }}
+>>>>>>> b9a8fe9 (feat: add publishNotReadyAddresses toggle)
   ports:
   {{- range $portName, $portNumber := $values.service.ports }}
     - port: {{ $portNumber }} # the port we expose on the Service, user configurable
@@ -19,7 +25,7 @@ spec:
       name: {{ $portName }}
   {{- end }}
   selector:
-    {{- include "erigon3.selectorLabels" . | nindent 4 }}
+    {{- include "erigon.selectorLabels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
 ---
 apiVersion: v1
@@ -33,9 +39,9 @@ metadata:
     service.kubernetes.io/topology-aware-hints: "auto"
     {{- end }}
   {{- end }}
-  name: {{ include "erigon3.fullname" . }}-{{ $componentName }}
+  name: {{ include "erigon.fullname" . }}-{{ $componentName }}
   labels:
-    {{- include "erigon3.labels" . | nindent 4 }}
+    {{- include "erigon.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
     serviceMonitorTarget: "true"  # Additional label to prevent matching the headless service above
 spec:
@@ -48,36 +54,36 @@ spec:
       name: {{ $portName }}
   {{- end }}
   selector:
-    {{- include "erigon3.selectorLabels" . | nindent 4 }}
+    {{- include "erigon.selectorLabels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
 {{- if $values.p2pNodePort.enabled }}
 {{- $port := $values.p2pNodePort.port }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "erigon3.fullname" . }}-{{ $componentName }}-p2p-0
+  name: {{ include "erigon.fullname" . }}-{{ $componentName }}-p2p-0
   labels:
-    {{- include "erigon3.labels" . | nindent 4 }}
+    {{- include "erigon.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
-    pod: {{ include "erigon3.fullname" . }}-{{ $componentName }}-0
+    pod: {{ include "erigon.fullname" . }}-{{ $componentName }}-0
     type: p2p # this label is used by the initContainer to select this service
 spec:
   type: NodePort
   externalTrafficPolicy: Local
   publishNotReadyAddresses: {{ default false $values.service.publishNotReadyAddresses.p2p }}
   ports:
     - name: tcp-p2p
-      port: {{ include "erigon3.p2pPort" $values }}
+      port: {{ include "erigon.p2pPort" $values }}
       protocol: TCP
       targetPort: tcp-p2p
       nodePort: {{ $port }}
     - name: udp-p2p
-      port: {{ include "erigon3.p2pPort" $values }}
+      port: {{ include "erigon.p2pPort" $values }}
       protocol: UDP
       targetPort: udp-p2p
       nodePort: {{ $port }}
   selector:
-    {{- include "erigon3.selectorLabels" . | nindent 4 }}
-    statefulset.kubernetes.io/pod-name: "{{ include "erigon3.fullname" $ }}-{{ $componentName }}-0"
+    {{- include "erigon.selectorLabels" . | nindent 4 }}
+    statefulset.kubernetes.io/pod-name: "{{ include "erigon.fullname" $ }}-{{ $componentName }}-0"
 {{- end }}