Merge pull request #279 from celo-org/jcortejoso/op-node

Update op-node values and templates
celo-org · May 8, 2024 · f369670 · f369670
2 parents ad88d28 + f065ad6
commit f369670
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/charts/op-node/Chart.yaml b/charts/op-node/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: op-node
 apiVersion: v2
-version: 0.0.1
+version: 0.0.2
 description: Celo implementation for op-node consensus engine (Optimism Rollup)
 home: https://clabs.co
 sources:

diff --git a/charts/op-node/README.md b/charts/op-node/README.md
@@ -1,6 +1,6 @@
 # op-node
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Celo implementation for op-node consensus engine (Optimism Rollup)
 Initially based on [dysnix/charts/op-node](https://github.com/dysnix/charts/tree/main/dysnix/op-node).
@@ -64,7 +64,7 @@ Initially based on [dysnix/charts/op-node](https://github.com/dysnix/charts/tree
 | gcsConfig.remote.endpointUrl | string | `""` |  |
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node"` |  |
-| image.tag | string | `"latest"` |  |
+| image.tag | string | `"v1.7.4"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `""` |  |
@@ -128,6 +128,8 @@ Initially based on [dysnix/charts/op-node](https://github.com/dysnix/charts/tree
 | services.rpc.port | int | `9545` |  |
 | services.rpc.type | string | `"ClusterIP"` |  |
 | sidecarContainers | list | `[]` |  |
+| statefulset.annotations | object | `{}` |  |
+| statefulset.podAnnotations | object | `{}` |  |
 | terminationGracePeriodSeconds | int | `300` |  |
 | tolerations | list | `[]` |  |
 | updateStrategy.type | string | `"RollingUpdate"` |  |

diff --git a/charts/op-node/templates/statefulset.yaml b/charts/op-node/templates/statefulset.yaml
@@ -2,6 +2,10 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "op-node.fullname" . }}
+  {{- with .Values.statefulset.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "op-node.labels" . | nindent 4 }}
 spec:
@@ -15,6 +19,15 @@ spec:
     metadata:
       labels:
         {{- include "op-node.selectorLabels" . | nindent 8 }}
+      annotations:
+      {{- with .Values.statefulset.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.config.metrics.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "{{ .Values.config.metrics.port }}"
+        prometheus.io/path: "/metrics"
+      {{- end }}
     spec:
       enableServiceLinks: false
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
@@ -76,7 +89,7 @@ spec:
         {{- end }}
         args:
         - |
-          op-node \
+          exec op-node \
             --l1={{ .Values.config.l1.url }} \
             --l1.trustrpc={{ .Values.config.l1.trustrpc }} \
             --l1.rpckind={{ .Values.config.l1.rpckind }} \

diff --git a/charts/op-node/values.yaml b/charts/op-node/values.yaml
@@ -1,7 +1,7 @@
 ---
 image:
   repository: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node
-  tag: latest
+  tag: v1.7.4
   pullPolicy: Always
 
 imagePullSecrets: []
@@ -20,6 +20,12 @@ serviceAccount:
 updateStrategy:
   type: RollingUpdate
 
+statefulset:
+  # Annotations to add to the statefulset
+  annotations: {}
+  # Annotations to add to the pod template
+  podAnnotations: {}
+
 terminationGracePeriodSeconds: 300
 
 podSecurityContext: {}
@@ -172,7 +178,7 @@ config:
   l1:
     url: https://1rpc.io/eth                              # eth L1 node rpc url, can also be ws://
     trustrpc: false                                       # enable if you trust L1 provider and want to fetch data from it faster
-    rpckind: any                                          # can be: alchemy, quicknode, infura, parity, nethermind, debug_geth, erigon, basic, any, standard
+    rpckind: any                                          # Valid options: alchemy, quicknode, infura, parity, nethermind, debug_geth, erigon, basic, any, standard
     beacon: https://ethereum-beacon-api.publicnode.com    # endpoint for L1 beacon node, used for retrieving EIP-4844 blob transactions
   l2:
     url: http://op-geth-authrpc:8551  # authrpc addr of op-geth L2 node, can also be ws://
@@ -197,7 +203,7 @@ config:
     useHostPort: false                 # use hostPort for p2p traffic instead of dedicated k8s svc
     bootnodes: []                      # override bootnodes
     sequencer:
-      key: ""                          # sequencer key
+      key: ""                            # sequencer key
 
 ## GCS Rollup sync config
 gcsConfig: