Feature: Update Holesky and Arbitrum Sepolia endpoints and align secret values references to use SOPS encrypted configs MGX-1253

.github/workflows/reusable-deploy.yml

@@ -77,14 +77,16 @@ jobs:
           # Install kubeconform
           curl -L https://github.com/yannh/kubeconform/releases/download/v0.6.6/kubeconform-linux-amd64.tar.gz | tar xzv && sudo mv kubeconform /usr/local/bin/
 
-          export ENVIRONMENT=${{ env.ENV_REF }} && export IMAGE_TAG=${{ inputs.version }}
+          export ENVIRONMENT=ci && export IMAGE_TAG=${{ inputs.version }}
           helmfile lint -e fungible
           helmfile template -e fungible | kubeconform -kubernetes-version 1.28.0 -skip ServiceMonitor -strict
 
       - name: Deploy services
         working-directory: ops/helmfiles
         run: |
-          export ENVIRONMENT=${{ env.ENV_REF }}
+          if [ "${{ inputs.env }}" == "fungible" ]; then
+            export ENVIRONMENT=${{ env.ENV_REF }}
+          fi
           export IMAGE_TAG=${{ inputs.version }}
 
           # https://dev.to/derlin/helmfile-difference-between-sync-and-apply-helm-3-28o1

ops/helmfiles/config/holesky.yaml

@@ -99,7 +99,7 @@ finalizerEnvSecrets: {}
 ###########################
 updaterEnabled: true
 
-updaterChainUrlEth: ref+sops://secrets.enc.yaml#/updaterChainUrlEth
+updaterChainUrlEth: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl
 updaterMnemonicEth: ref+sops://secrets.enc.yaml#/updaterMnemonicEth
 updaterEnvEth:
   CHAIN: "holesky"
@@ -109,7 +109,7 @@ updaterEnvEth:
   MANGATA_CONTRACT_ADDRESS: "0x93de6a193A839218BCA00c8D478256Ac78281cE3"
   FINALIZATION_SOURCE: "relay"
 
-updaterChainUrlArb: ref+sops://secrets.enc.yaml#/updaterChainUrlArb
+updaterChainUrlArb: ref+sops://secrets.enc.yaml#/sepoliaArbitrumHttpsUrl
 updaterMnemonicArb: ref+sops://secrets.enc.yaml#/updaterMnemonicArb
 updaterEnvArb:
   CHAIN: "arbitrum"
@@ -127,15 +127,15 @@ secondSequencerEnabled: false
 
 firstSequencerMnemonicEth: "0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b"
 secondSequencerMnemonicEth: "bottom drive obey lake curtain smoke basket hold race lonely fit walk//Bob"
-sequencerChainUrlEth: ref+sops://secrets.enc.yaml#/updaterChainUrlEth
+sequencerChainUrlEth: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl
 sequencerEnvEth:
   L1_CHAIN: "Ethereum"
   MANGATA_NODE_URL: ws://collator-01:9944
   MANGATA_CONTRACT_ADDRESS: "0x93de6a193A839218BCA00c8D478256Ac78281cE3"
 
 firstSequencerMnemonicArb: "0x0b6e18cafb6ed99687ec547bd28139cafdd2bffe70e6b688025de6b445aa5c5b"
 secondSequencerMnemonicArb: "bottom drive obey lake curtain smoke basket hold race lonely fit walk//Bob"
-sequencerChainUrlArb: ref+sops://secrets.enc.yaml#/updaterChainUrlArb
+sequencerChainUrlArb: ref+sops://secrets.enc.yaml#/sepoliaArbitrumHttpsUrl
 sequencerEnvArb:
   L1_CHAIN: "Arbitrum"
   MANGATA_NODE_URL: ws://collator-01:9944

ops/helmfiles/config/testnet.yaml

@@ -1,6 +1,8 @@
 remoteCluster: true
 
 enableArbitrumServices: false
+blockscoutEnabled: false
+
 
 ####################
 # evm-node configs #
@@ -12,6 +14,33 @@ evmNode:
 # collator configs #
 #####################
 collatorsEnabled: false
+# TODO: Those configs below are not used for this env as collators for it are deployed from `gitops` repository
+# and we are using `gitops` repository for deploying the collators for this env
+collator:
+  image:
+    repository: mangatasolutions/rollup-node
+    tag: 3a07824d8b8a6ad027424629b814a5edb61654cf
+  disableChainspecGeneration: true
+  customChainspecUrl: https://raw.githubusercontent.com/mangata-finance/chainspec/master/rollup-holesky-3a07824d8b8a6ad027424629b814a5edb61654cf-raw.json
+  enableServiceMonitorCollectors: true
+  storageClass: node-data-volume-retain
+  storageSize: 50Gi
+  wsHealthExporter:
+    enabled: true
+    image: paritytech/ws-health-exporter:bc071a44-20230830
+    env:
+      WSHE_NODE_MIN_PEERS: 2
+  tolerations:
+    - key: production
+      operator: Equal
+      value: "true"
+      effect: NoSchedule
+  firstCollatorNodeSelector:
+    production: "true"
+    topology.kubernetes.io/zone: europe-west1-b
+  secondCollatorNodeSelector:
+    production: "true"
+    topology.kubernetes.io/zone: europe-west1-c
 
 ####################
 # evm-node configs #
@@ -45,10 +74,10 @@ envEth:
 ######################
 aggregatorEnabled: true
 aggregatorEnvSecrets:
-  ECDSA_KEY_JSON: ref+gcpsecrets://direct-pixel-353917/eigen-goerli-aggregator-ecdsa-key
-  ECDSA_KEY_PASSWORD: ref+gcpsecrets://direct-pixel-353917/eigen-goerli-aggregator-ecdsa-password
-  ETH_RPC_URL: ref+gcpsecrets://direct-pixel-353917/holesky-https-rpc-url
-  ETH_WS_URL: ref+gcpsecrets://direct-pixel-353917/holesky-wss-rpc-url
+  ECDSA_KEY_JSON: ref+sops://secrets.enc.yaml#/testnetAggregatorEcdsaKeyJson
+  ECDSA_KEY_PASSWORD: ref+sops://secrets.enc.yaml#/testnetAggregatorEcdsaKeyPassword
+  ETH_RPC_URL: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl
+  ETH_WS_URL: ref+sops://secrets.enc.yaml#/holeskyEthereumWssUrl
 
 #####################
 # finalizer configs #
@@ -57,20 +86,20 @@ secondFinalizerEnabled: false
 finalizerEnabled: true
 finalizerEnableServiceMonitorCollectors: true
 finalizerEnvSecrets:
-  ECDSA_KEY_JSON: ref+gcpsecrets://direct-pixel-353917/eigen-goerli-operator-1-ecdsa-key
-  ECDSA_KEY_PASSWORD: ref+gcpsecrets://direct-pixel-353917/eigen-goerli-operator-1-ecdsa-password
-  BLS_KEY_JSON: ref+gcpsecrets://direct-pixel-353917/eigen-goerli-operator-1-bls-key
-  BLS_KEY_PASSWORD: ref+gcpsecrets://direct-pixel-353917/eigen-goerli-operator-1-bls-password
-  ETH_RPC_URL: ref+gcpsecrets://direct-pixel-353917/holesky-https-rpc-url
-  ETH_WS_URL: ref+gcpsecrets://direct-pixel-353917/holesky-wss-rpc-url
+  ECDSA_KEY_JSON: ref+sops://secrets.enc.yaml#/testnetFinalizerEcdsaKeyJson
+  ECDSA_KEY_PASSWORD: ref+sops://secrets.enc.yaml#/testnetFinalizerEcdsaKeyPassword
+  BLS_KEY_JSON: ref+sops://secrets.enc.yaml#/testnetFinalizerBlsKeyJson
+  BLS_KEY_PASSWORD: ref+sops://secrets.enc.yaml#/testnetFinalizerBlsKeyPassword
+  ETH_RPC_URL: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl
+  ETH_WS_URL: ref+sops://secrets.enc.yaml#/holeskyEthereumWssUrl
 
 ###########################
 # rollup-updater configs #
 ###########################
 updaterEnabled: true
 
-updaterChainUrlEth: ref+gcpsecrets://direct-pixel-353917/holesky-https-rpc-url
-updaterMnemonicEth: ref+gcpsecrets://direct-pixel-353917/eigen-mangata-updater-private-key
+updaterChainUrlEth: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl
+updaterMnemonicEth: ref+sops://secrets.enc.yaml#/testnetUpdaterMnemonicEth
 updaterEnvEth:
   L1_CHAIN: "Ethereum"
   MANGATA_NODE_URL: wss://collator-01-ws-rollup-testnet.mangata.online
@@ -97,9 +126,9 @@ updaterEnvArb:
 sequencerEnabled: true
 secondSequencerEnabled: false
 
-firstSequencerMnemonicEth: ref+gcpsecrets://direct-pixel-353917/eigen-mangata-sequencer-mnemonic
-secondSequencerMnemonicEth: ref+gcpsecrets://direct-pixel-353917/eigen-mangata-sequencer-mnemonic
-sequencerChainUrlEth: ref+gcpsecrets://direct-pixel-353917/holesky-https-rpc-url
+firstSequencerMnemonicEth: ref+sops://secrets.enc.yaml#/testnetFirstSequencerMnemonicEth
+secondSequencerMnemonicEth: ref+sops://secrets.enc.yaml#/testnetSecondSequencerMnemonicEth
+sequencerChainUrlEth: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl
 sequencerEnvEth:
   L1_CHAIN: "Ethereum"
   MANGATA_NODE_URL: wss://collator-01-ws-rollup-testnet.mangata.online