Use sts for op-geth/node and use LoadBalancer for op-geth and blockscout

planetarium · Jan 30, 2024 · 5a1c5fd · 5a1c5fd
1 parent 0ef7800
commit 5a1c5fd
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 49 deletions.
diff --git a/templates/k8s/blockscout-deployment.yaml b/templates/k8s/blockscout-deployment.yaml
@@ -134,7 +134,6 @@ spec:
           name: blockscout
           ports:
             - containerPort: 4000
-              hostPort: 4000
               protocol: TCP
           volumeMounts:
             - mountPath: /genesis.json

diff --git a/templates/k8s/blockscout-postgres-deployment.yaml b/templates/k8s/blockscout-postgres-deployment.yaml
@@ -32,7 +32,6 @@ spec:
           volumeMounts:
             - mountPath: /var/lib/postgresql/data
               name: blockscout-postgres-pvc
-      restartPolicy: Always
       volumes:
         - name: blockscout-postgres-pvc
           persistentVolumeClaim:

diff --git a/templates/k8s/blockscout-service.yaml b/templates/k8s/blockscout-service.yaml
@@ -6,7 +6,8 @@ metadata:
 spec:
   selector:
     name: blockscout
+  type: LoadBalancer
   ports:
     - protocol: TCP
-      port: 4000
+      port: 80
       targetPort: 4000
diff --git a/templates/k8s/env-cm.yaml b/templates/k8s/env-cm.yaml
@@ -4,3 +4,5 @@ metadata:
   name: env-cm
   namespace: l2launcher
 data:
+  L1_RPC: ""
+  L2_CHAIN_ID: ""
diff --git a/templates/k8s/env-secret.yaml b/templates/k8s/env-secret.yaml
@@ -4,3 +4,7 @@ metadata:
   name: env-secret
   namespace: l2launcher
 stringData:
+  ADMIN_KEY: ""
+  BATCHER_KEY: ""
+  PROPOSER_KEY: ""
+  SEQUENCER_KEY: ""
diff --git a/templates/k8s/op-batcher-deployment.yaml b/templates/k8s/op-batcher-deployment.yaml
@@ -41,9 +41,11 @@ spec:
                   key: L1_RPC
             - name: BATCHER_KEY
               valueFrom:
-                configMapKeyRef:
-                  name: env-cm
+                secretKeyRef:
+                  name: env-secret
                   key: BATCHER_KEY
           image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.4.2
           name: op-batcher
-      restartPolicy: Always
+          ports:
+            - containerPort: 8548
+              protocol: TCP
diff --git a/templates/k8s/op-geth-pvc.yaml b/templates/k8s/op-geth-pvc.yaml
diff --git a/templates/k8s/op-geth-service.yaml b/templates/k8s/op-geth-service.yaml
@@ -6,6 +6,7 @@ metadata:
 spec:
   selector:
     name: op-geth
+  type: LoadBalancer
   ports:
     - protocol: TCP
       name: rpc

diff --git a/templates/k8s/op-geth-deployment.yaml → templates/k8s/op-geth-sts.yaml b/templates/k8s/op-geth-deployment.yaml → templates/k8s/op-geth-sts.yaml
@@ -1,13 +1,13 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: op-geth
   namespace: l2launcher
 spec:
   selector:
     matchLabels:
       name: op-geth
-  replicas: 1
+  replicas: 2
   template:
     metadata:
       labels:
@@ -54,7 +54,7 @@ spec:
           name: genesis-init-predeploy
           volumeMounts:
             - mountPath: /data
-              name: op-geth-pvc
+              name: op-geth-volume
             - mountPath: /genesis
               name: genesis-pvc
             - mountPath: /genesis/predeploy.json
@@ -102,17 +102,23 @@ spec:
               protocol: TCP
           volumeMounts:
             - mountPath: /data
-              name: op-geth-pvc
+              name: op-geth-volume
             - mountPath: /genesis
               name: genesis-pvc
               readOnly: true
       volumes:
         - name: genesis-pvc
           persistentVolumeClaim:
             claimName: genesis-pvc
-        - name: op-geth-pvc
-          persistentVolumeClaim:
-            claimName: op-geth-pvc
         - name: predeploy-json-cm
           configMap:
             name: predeploy-json-cm
+  volumeClaimTemplates:
+  - metadata:
+      name: op-geth-volume
+    spec:
+      accessModes:
+        - ReadWriteOnce
+      resources:
+        requests:
+          storage: 100Mi
diff --git a/templates/k8s/op-node-pvc.yaml b/templates/k8s/op-node-pvc.yaml
diff --git a/templates/k8s/op-node-service.yaml b/templates/k8s/op-node-service.yaml
@@ -8,5 +8,9 @@ spec:
     name: op-node
   ports:
     - protocol: TCP
+      name: rpc
       port: 8547
       targetPort: 8547
+    - protocol: TCP
+      name: p2p
+      port: 9003
diff --git a/templates/k8s/op-node-deployment.yaml → templates/k8s/op-node-sts.yaml b/templates/k8s/op-node-deployment.yaml → templates/k8s/op-node-sts.yaml
@@ -1,10 +1,10 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: op-node
   namespace: l2launcher
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       name: op-node
@@ -25,8 +25,9 @@ spec:
                 --rollup.config=/genesis/rollup.json \
                 --rpc.addr=0.0.0.0 \
                 --rpc.port=8547 \
-                --p2p.disable \
                 --rpc.enable-admin \
+                --p2p.listen.ip=0.0.0.0 \
+                --p2p.listen.tcp=9003 \
                 --p2p.sequencer.key=$${SEQUENCER_KEY#0x} \
                 --l1=$(L1_RPC) \
                 --l1.rpckind=any \
@@ -42,8 +43,8 @@ spec:
                   key: L1_RPC
             - name: SEQUENCER_KEY
               valueFrom:
-                configMapKeyRef:
-                  name: env-cm
+                secretKeyRef:
+                  name: env-secret
                   key: SEQUENCER_KEY
           image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.4.2
           livenessProbe:
@@ -57,18 +58,26 @@ spec:
           name: op-node
           ports:
             - containerPort: 8547
-              hostPort: 8547
+              protocol: TCP
+            - containerPort: 9003
               protocol: TCP
           volumeMounts:
             - mountPath: /data
-              name: op-node-pvc
+              name: op-node-volume
             - mountPath: /genesis
               name: genesis-pvc
-      restartPolicy: Always
+              readOnly: true
       volumes:
-        - name: op-node-pvc
-          persistentVolumeClaim:
-            claimName: op-node-pvc
         - name: genesis-pvc
           persistentVolumeClaim:
             claimName: genesis-pvc
+            readOnly: true
+  volumeClaimTemplates:
+  - metadata:
+      name: op-node-volume
+    spec:
+      accessModes:
+        - ReadWriteOnce
+      resources:
+        requests:
+          storage: 100Mi
diff --git a/templates/k8s/op-proposer-deployment.yaml b/templates/k8s/op-proposer-deployment.yaml
@@ -31,19 +31,23 @@ spec:
                   key: L1_RPC
             - name: PROPOSER_KEY
               valueFrom:
-                configMapKeyRef:
-                  name: env-cm
+                secretKeyRef:
+                  name: env-secret
                   key: PROPOSER_KEY
           command:
             - sh
             - -c
           image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:v1.4.2
           name: op-proposer
+          ports:
+            - containerPort: 8560
+              protocol: TCP
           volumeMounts:
             - mountPath: /genesis
               name: genesis-pvc
-      restartPolicy: Always
+              readOnly: true
       volumes:
         - name: genesis-pvc
           persistentVolumeClaim:
             claimName: genesis-pvc
+            readOnly: true