op-replica env should include new values (#2803)

* op-replica env should include new values

* Also kovan

* Remove replica-healthcheck envs (uses network env now)

* Update default-mainnet.env
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

infra/op-replica/docker-compose/default-kovan.env

@@ -3,7 +3,6 @@ COMPOSE_FILE=replica.yml:replica-shared.yml:replica-toml.yml
 ETH_NETWORK=kovan
 DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=WONT_WORK_UNLESS_YOU_PROVIDE_A_VALID_ETHEREUM_L1_ENDPOINT
 DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://kovan.optimism.io
-REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=https://kovan.optimism.io
 SEQUENCER_CLIENT_HTTP=https://kovan.optimism.io
 SHARED_ENV_PATH=../envs/kovan
 GCMODE=archive
@@ -14,5 +13,7 @@ L2GETH_HTTP_PORT=9991
 L2GETH_WS_PORT=9992
 DTL_PORT=7878
 GETH_INIT_SCRIPT=check-for-chaindata-berlin.sh
+HEALTHCHECK__REFERENCE_RPC_PROVIDER=https://kovan.optimism.io
+HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545
 
 RESTART=unless-stopped

infra/op-replica/docker-compose/default-mainnet.env

@@ -2,8 +2,7 @@ COMPOSE_PROJECT_NAME=op-replica
 COMPOSE_FILE=replica.yml:replica-shared.yml:replica-toml.yml
 ETH_NETWORK=mainnet
 DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=WONT_WORK_UNLESS_YOU_PROVIDE_A_VALID_ETHEREUM_L1_ENDPOINT
-DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://mainnet.optimism.io
-REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=https://mainnet.optimism.io
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=<infra-provider-l2-endpoint>
 SEQUENCER_CLIENT_HTTP=https://mainnet.optimism.io
 SHARED_ENV_PATH=../envs/mainnet
 GCMODE=archive
@@ -14,6 +13,8 @@ L2GETH_HTTP_PORT=9991
 L2GETH_WS_PORT=9992
 DTL_PORT=7878
 GETH_INIT_SCRIPT=check-for-chaindata-berlin.sh
+HEALTHCHECK__REFERENCE_RPC_PROVIDER=<infra-provider-l2-endpoiont>
+HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545
 
 RESTART=unless-stopped
 

infra/op-replica/envs/goerli-nightly/kustomization.yaml

@@ -8,9 +8,6 @@ configMapGenerator:
   - name: l2geth-replica
     envs:
       - ./l2geth-replica.env
-  - name: replica-healthcheck
-    envs:
-      - ./replica-healthcheck.env
   - name: geth-scripts
     files:
       - ./check-for-chaindata.sh
\ No newline at end of file

infra/op-replica/envs/goerli-nightly/replica-healthcheck.env

-REPLICA_HEALTHCHECK__ETH_NETWORK=goerli-nightly
-REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.9
-REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/kovan/kustomization.yaml

@@ -8,6 +8,3 @@ configMapGenerator:
   - name: l2geth-replica
     envs:
       - ./l2geth-replica.env
-  - name: replica-healthcheck
-    envs:
-      - ./replica-healthcheck.env

infra/op-replica/envs/kovan/replica-healthcheck.env

-REPLICA_HEALTHCHECK__ETH_NETWORK=kovan
-REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.9
-REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
-REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet/kustomization.yaml

@@ -8,6 +8,3 @@ configMapGenerator:
   - name: l2geth-replica
     envs:
       - ./l2geth-replica.env
-  - name: replica-healthcheck
-    envs:
-      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet/replica-healthcheck.env

-REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
-REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.8
-REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
-REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file