diff --git a/infra/op-replica/kustomize/bases/l2geth-replica/service.yaml b/infra/op-replica/kustomize/bases/l2geth-replica/service.yaml index fd4f0deb613a1..b8b3f78f2fc8a 100644 --- a/infra/op-replica/kustomize/bases/l2geth-replica/service.yaml +++ b/infra/op-replica/kustomize/bases/l2geth-replica/service.yaml @@ -6,7 +6,7 @@ metadata: spec: selector: app: l2geth-replica - type: ClusterIP + type: NodePort ports: - name: rpc port: 8545 diff --git a/infra/op-replica/kustomize/bases/replica-healthcheck-v1/deployment.yaml b/infra/op-replica/kustomize/bases/replica-healthcheck-v1/deployment.yaml index fa2d184d815d1..d4bd3c632120f 100644 --- a/infra/op-replica/kustomize/bases/replica-healthcheck-v1/deployment.yaml +++ b/infra/op-replica/kustomize/bases/replica-healthcheck-v1/deployment.yaml @@ -9,6 +9,9 @@ spec: containers: - name: replica-healthcheck image: ethereumoptimism/replica-healthcheck-v1 + envFrom: + - configMapRef: + name: replica-healthcheck-v1 ports: - containerPort: 7300 name: metrics diff --git a/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/kustomization.yaml b/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/kustomization.yaml index f1f2503c72072..ae2c99721091a 100644 --- a/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/kustomization.yaml +++ b/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/kustomization.yaml @@ -14,6 +14,7 @@ resources: - ../../bases/l2geth-replica - ../../bases/servicemonitors - ../../bases/replica-healthcheck + - ../../bases/replica-healthcheck-v1 - ./volumes.yaml images: @@ -26,6 +27,9 @@ images: - name: ethereumoptimism/replica-healthcheck newName: ethereumoptimism/replica-healthcheck newTag: 0.3.6 + - name: ethereumoptimism/replica-healthcheck-v1 + newName: ethereumoptimism/replica-healthcheck + newTag: 1.0.6 patchesStrategicMerge: - ./patches/dtl.yaml @@ -44,4 +48,9 @@ patches: group: apps version: v1 kind: StatefulSet - name: data-transport-layer \ No newline at end of file + name: data-transport-layer + +configMapGenerator: + - name: replica-healthcheck-v1 + envs: + - ./replica-healthcheck-v1.env diff --git a/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/replica-healthcheck-v1.env b/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/replica-healthcheck-v1.env new file mode 100644 index 0000000000000..d7d7547b4bf9c --- /dev/null +++ b/infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/replica-healthcheck-v1.env @@ -0,0 +1,2 @@ +HEALTHCHECK__REFERENCE_RPC_PROVIDER=http://sequencer.default:8545 +HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545 \ No newline at end of file diff --git a/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/kustomization.yaml b/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/kustomization.yaml index 735350629441e..c0a92fc381f95 100644 --- a/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/kustomization.yaml +++ b/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/kustomization.yaml @@ -15,18 +15,22 @@ resources: - ../../bases/l2geth-replica - ../../bases/servicemonitors - ../../bases/replica-healthcheck + - ../../bases/replica-healthcheck-v1 - ./volumes.yaml images: - name: ethereumoptimism/data-transport-layer newName: ethereumoptimism/data-transport-layer - newTag: 0.5.21 + newTag: prerelease-dtl-race - name: ethereumoptimism/l2geth newName: ethereumoptimism/l2geth - newTag: 0.5.14 + newTag: prerelease-l2g-l1-sync-recovery - name: ethereumoptimism/replica-healthcheck newName: ethereumoptimism/replica-healthcheck newTag: 0.3.6 + - name: ethereumoptimism/replica-healthcheck-v1 + newName: ethereumoptimism/replica-healthcheck + newTag: 1.0.6 patchesStrategicMerge: - ./patches/dtl.yaml @@ -45,4 +49,9 @@ patches: group: apps version: v1 kind: StatefulSet - name: data-transport-layer \ No newline at end of file + name: data-transport-layer + +configMapGenerator: + - name: replica-healthcheck-v1 + envs: + - ./replica-healthcheck-v1.env diff --git a/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/replica-healthcheck-v1.env b/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/replica-healthcheck-v1.env new file mode 100644 index 0000000000000..d7d7547b4bf9c --- /dev/null +++ b/infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/replica-healthcheck-v1.env @@ -0,0 +1,2 @@ +HEALTHCHECK__REFERENCE_RPC_PROVIDER=http://sequencer.default:8545 +HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545 \ No newline at end of file diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/kustomization.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/kustomization.yaml index 55f3c5f6ce605..fa839fd498fdb 100644 --- a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/kustomization.yaml +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/kustomization.yaml @@ -13,7 +13,7 @@ resources: - ../../bases/data-transport-layer - ../../bases/l2geth-replica - ../../bases/servicemonitors - - ../../bases/replica-healthcheck + - ../../bases/replica-healthcheck-v1 - ./ingress.yaml - ./volumes.yaml @@ -24,14 +24,13 @@ images: - name: ethereumoptimism/l2geth newName: ethereumoptimism/l2geth newTag: 0.5.14 - - name: ethereumoptimism/replica-healthcheck + - name: ethereumoptimism/replica-healthcheck-v1 newName: ethereumoptimism/replica-healthcheck - newTag: 0.3.6 + newTag: 1.0.6 patchesStrategicMerge: - ./patches/dtl.yaml - ./patches/l2geth.yaml - - ./patches/replica-healthcheck.yaml patches: - path: ./patches/l2geth-volume.yaml @@ -45,4 +44,9 @@ patches: group: apps version: v1 kind: StatefulSet - name: data-transport-layer \ No newline at end of file + name: data-transport-layer + +configMapGenerator: + - name: replica-healthcheck-v1 + envs: + - ./replica-healthcheck-v1.env diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/replica-healthcheck-v1.env b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/replica-healthcheck-v1.env new file mode 100644 index 0000000000000..51a315500d8ec --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/replica-healthcheck-v1.env @@ -0,0 +1,2 @@ +HEALTHCHECK__REFERENCE_RPC_PROVIDER=https://kovan.optimism.io +HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545 \ No newline at end of file diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/kustomization.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/kustomization.yaml new file mode 100644 index 0000000000000..be4d30a329493 --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/kustomization.yaml @@ -0,0 +1,51 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kovan-replica-0-5-17 +commonLabels: + network: kovan + provider: internal + +bases: + - ../../../envs/kovan-gen5-berlin + - ../../../scripts + +resources: + - ../../bases/data-transport-layer + - ../../bases/l2geth-replica + - ../../bases/servicemonitors + - ../../bases/replica-healthcheck-v1 + - ./volumes.yaml + +images: + - name: ethereumoptimism/data-transport-layer + newName: ethereumoptimism/data-transport-layer + newTag: 0.5.23 + - name: ethereumoptimism/l2geth + newName: ethereumoptimism/l2geth + newTag: 0.5.17 + - name: ethereumoptimism/replica-healthcheck-v1 + newName: ethereumoptimism/replica-healthcheck + newTag: 1.0.6 + +patchesStrategicMerge: + - ./patches/dtl.yaml + - ./patches/l2geth.yaml + +patches: + - path: ./patches/l2geth-volume.yaml + target: + group: apps + version: v1 + kind: StatefulSet + name: l2geth-replica + - path: ./patches/dtl-volume.yaml + target: + group: apps + version: v1 + kind: StatefulSet + name: data-transport-layer + +configMapGenerator: + - name: replica-healthcheck-v1 + envs: + - ./replica-healthcheck-v1.env diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/dtl-volume.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/dtl-volume.yaml new file mode 100644 index 0000000000000..35e97c6d54ab6 --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/dtl-volume.yaml @@ -0,0 +1,7 @@ +--- +- op: replace + path: /spec/template/spec/volumes/0 + value: + name: data-transport-layer + persistentVolumeClaim: + claimName: data-transport-layer-data diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/dtl.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/dtl.yaml new file mode 100644 index 0000000000000..975286c2aa229 --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/dtl.yaml @@ -0,0 +1,41 @@ +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: data-transport-layer +spec: + template: + spec: + initContainers: + - name: wait-for-l1 + env: + - name: L1_NODE_WEB3_URL + valueFrom: + secretKeyRef: + name: replica-secrets + key: l1-rpc-endpoint + containers: + - name: data-transport-layer + resources: + limits: + cpu: "2" + memory: 4Gi + requests: + cpu: "1" + memory: 1Gi + env: + - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT + valueFrom: + secretKeyRef: + name: replica-secrets + key: l1-rpc-endpoint + - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT + valueFrom: + secretKeyRef: + name: replica-secrets + key: l2-rpc-endpoint + - name: L1_NODE_WEB3_URL + valueFrom: + secretKeyRef: + name: replica-secrets + key: l1-rpc-endpoint \ No newline at end of file diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/l2geth-volume.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/l2geth-volume.yaml new file mode 100644 index 0000000000000..60b117f7923bf --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/l2geth-volume.yaml @@ -0,0 +1,6 @@ +- op: replace + path: /spec/template/spec/volumes/0 + value: + name: l2geth-replica-data + persistentVolumeClaim: + claimName: l2geth-replica-data diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/l2geth.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/l2geth.yaml new file mode 100644 index 0000000000000..37710cd9772d8 --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/patches/l2geth.yaml @@ -0,0 +1,20 @@ +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: l2geth-replica +spec: + template: + spec: + containers: + - name: l2geth-replica + env: + - name: IPC_DISABLE + value: "false" + resources: + limits: + cpu: "4" + memory: 12Gi + requests: + cpu: "2" + memory: 8Gi diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/replica-healthcheck-v1.env b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/replica-healthcheck-v1.env new file mode 100644 index 0000000000000..51a315500d8ec --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/replica-healthcheck-v1.env @@ -0,0 +1,2 @@ +HEALTHCHECK__REFERENCE_RPC_PROVIDER=https://kovan.optimism.io +HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545 \ No newline at end of file diff --git a/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/volumes.yaml b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/volumes.yaml new file mode 100644 index 0000000000000..4defc7ed966df --- /dev/null +++ b/infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-17/volumes.yaml @@ -0,0 +1,24 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: l2geth-replica-data +spec: + storageClassName: premium-rwo + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 200Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: data-transport-layer-data +spec: + storageClassName: premium-rwo + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi diff --git a/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-14/kustomization.yaml b/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-14/kustomization.yaml index 330c943d7393b..395ca4e0c5a3f 100644 --- a/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-14/kustomization.yaml +++ b/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-14/kustomization.yaml @@ -13,7 +13,6 @@ resources: - ../../bases/data-transport-layer - ../../bases/l2geth-replica - ../../bases/servicemonitors - - ../../bases/replica-healthcheck - ../../bases/replica-healthcheck-v1 - ./volumes.yaml - ./ingress.yaml @@ -30,12 +29,11 @@ images: newTag: 0.3.3 - name: ethereumoptimism/replica-healthcheck-v1 newName: ethereumoptimism/replica-healthcheck - newTag: 1.0.4 + newTag: 1.0.6 patchesStrategicMerge: - ./patches/dtl.yaml - ./patches/l2geth.yaml - - ./patches/replica-healthcheck.yaml patches: - path: ./patches/l2geth-volume.yaml diff --git a/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-17/kustomization.yaml b/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-17/kustomization.yaml index 381636f0e0d39..ed835896213de 100644 --- a/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-17/kustomization.yaml +++ b/infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-17/kustomization.yaml @@ -13,7 +13,6 @@ resources: - ../../bases/data-transport-layer - ../../bases/l2geth-replica - ../../bases/servicemonitors - - ../../bases/replica-healthcheck - ../../bases/replica-healthcheck-v1 - ./volumes.yaml @@ -24,17 +23,13 @@ images: - name: ethereumoptimism/l2geth newName: ethereumoptimism/l2geth newTag: 0.5.17 - - name: ethereumoptimism/replica-healthcheck - newName: ethereumoptimism/replica-healthcheck - newTag: 0.3.3 - name: ethereumoptimism/replica-healthcheck-v1 newName: ethereumoptimism/replica-healthcheck - newTag: 1.0.4 + newTag: 1.0.6 patchesStrategicMerge: - ./patches/dtl.yaml - ./patches/l2geth.yaml - - ./patches/replica-healthcheck.yaml patches: - path: ./patches/l2geth-volume.yaml