From 2ccd7ebf1d16c71cebb15887d7e2b19a0a55b6c6 Mon Sep 17 00:00:00 2001 From: Morty Date: Thu, 5 Sep 2024 05:11:46 +0800 Subject: [PATCH 1/6] feat: remove dsn from config files --- charts/bridge-history-api/Chart.yaml | 2 +- charts/bridge-history-api/README.md | 3 ++- charts/bridge-history-api/values.yaml | 4 ++++ charts/bridge-history-fetcher/Chart.yaml | 2 +- charts/bridge-history-fetcher/README.md | 5 +++-- charts/bridge-history-fetcher/values.yaml | 6 +++++- charts/chain-monitor/Chart.yaml | 2 +- charts/chain-monitor/README.md | 10 ++++++---- charts/chain-monitor/values.yaml | 13 ++++++++++--- charts/contracts/Chart.yaml | 2 +- charts/contracts/README.md | 4 ++-- charts/contracts/values.yaml | 2 +- charts/coordinator-cron/Chart.yaml | 2 +- charts/coordinator-cron/README.md | 5 +++-- charts/coordinator-cron/values.yaml | 6 +++++- charts/gas-oracle/Chart.yaml | 2 +- charts/gas-oracle/README.md | 5 +++-- charts/gas-oracle/values.yaml | 6 +++++- charts/rollup-node/Chart.yaml | 2 +- charts/rollup-node/README.md | 5 +++-- charts/rollup-node/values.yaml | 6 +++++- charts/scroll-sdk/Chart.yaml | 16 ++++++++-------- charts/scroll-sdk/README.md | 16 ++++++++-------- devnet/Makefile | 2 +- devnet/create-env-files.sh | 17 +++++++---------- 25 files changed, 88 insertions(+), 57 deletions(-) diff --git a/charts/bridge-history-api/Chart.yaml b/charts/bridge-history-api/Chart.yaml index 289c6d7b..38addb12 100644 --- a/charts/bridge-history-api/Chart.yaml +++ b/charts/bridge-history-api/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bridge-history-api helm charts name: bridge-history-api -version: 0.0.5 +version: 0.0.6 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/bridge-history-api/README.md b/charts/bridge-history-api/README.md index d24dcade..b26a39f4 100644 --- a/charts/bridge-history-api/README.md +++ b/charts/bridge-history-api/README.md @@ -1,6 +1,6 @@ # bridge-history-api -![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) bridge-history-api helm charts @@ -35,6 +35,7 @@ Kubernetes: `>=1.22.0-0` | defaultProbes.enabled | bool | `true` | | | defaultProbes.spec.httpGet.path | string | `"/health"` | | | defaultProbes.spec.httpGet.port | int | `8090` | | +| envFrom[0].configMapRef.name | string | `"bridge-history-api-env"` | | | env[0].name | string | `"METRICS_PORT"` | | | env[0].value | string | `"8090"` | | | global.fullnameOverride | string | `"bridge-history-api"` | | diff --git a/charts/bridge-history-api/values.yaml b/charts/bridge-history-api/values.yaml index d44aa3b4..19f7ae34 100644 --- a/charts/bridge-history-api/values.yaml +++ b/charts/bridge-history-api/values.yaml @@ -23,6 +23,10 @@ env: - name: METRICS_PORT value: "8090" +envFrom: + - configMapRef: + name: bridge-history-api-env + initContainers: 1-wait-for-l1: image: scrolltech/scroll-alpine:v0.0.1 diff --git a/charts/bridge-history-fetcher/Chart.yaml b/charts/bridge-history-fetcher/Chart.yaml index 118acd90..68f182df 100644 --- a/charts/bridge-history-fetcher/Chart.yaml +++ b/charts/bridge-history-fetcher/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bridge-history-fetcher helm charts name: bridge-history-fetcher -version: 0.0.6 +version: 0.0.7 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/bridge-history-fetcher/README.md b/charts/bridge-history-fetcher/README.md index 092f8d85..a13f7c29 100644 --- a/charts/bridge-history-fetcher/README.md +++ b/charts/bridge-history-fetcher/README.md @@ -1,6 +1,6 @@ # bridge-history-fetcher -![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) bridge-history-fetcher helm charts @@ -35,6 +35,7 @@ Kubernetes: `>=1.22.0-0` | defaultProbes.enabled | bool | `true` | | | defaultProbes.spec.httpGet.path | string | `"/health"` | | | defaultProbes.spec.httpGet.port | int | `8090` | | +| envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` | | | env[0].name | string | `"METRICS_PORT"` | | | env[0].value | string | `"8090"` | | | global.fullnameOverride | string | `"bridge-history-fetcher"` | | @@ -43,7 +44,7 @@ Kubernetes: `>=1.22.0-0` | image.repository | string | `"scrolltech/bridgehistoryapi-fetcher"` | | | image.tag | string | `"v4.4.59"` | | | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | | -| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | | +| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_BRIDGE_HISTORY_DB_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | | initContainers.1-check-postgres-connection.args[3] | string | `"0"` | | | initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` | | diff --git a/charts/bridge-history-fetcher/values.yaml b/charts/bridge-history-fetcher/values.yaml index d8326a3d..f195dfa8 100644 --- a/charts/bridge-history-fetcher/values.yaml +++ b/charts/bridge-history-fetcher/values.yaml @@ -23,6 +23,10 @@ env: - name: METRICS_PORT value: "8090" +envFrom: + - configMapRef: + name: bridge-history-fetcher-env + service: main: enabled: true @@ -82,7 +86,7 @@ initContainers: image: atkrad/wait4x:latest args: - postgresql - - $(DATABASE_URL) + - $(SCROLL_BRIDGE_HISTORY_DB_DSN) - --timeout - "0" envFrom: diff --git a/charts/chain-monitor/Chart.yaml b/charts/chain-monitor/Chart.yaml index d2ff64d7..1da945e9 100644 --- a/charts/chain-monitor/Chart.yaml +++ b/charts/chain-monitor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: chain-monitor helm charts name: chain-monitor -version: 0.0.4 +version: 0.0.5 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/chain-monitor/README.md b/charts/chain-monitor/README.md index af8de443..1705c606 100644 --- a/charts/chain-monitor/README.md +++ b/charts/chain-monitor/README.md @@ -1,6 +1,6 @@ # chain-monitor -![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) chain-monitor helm charts @@ -27,6 +27,7 @@ Kubernetes: `>=1.22.0-0` | command[1] | string | `"-c"` | | | command[2] | string | `"chain-monitor --config /app/config/chain-monitor-config.json --http --http.port ${CHAIN_MONITOR_SERVER_PORT} --metrics --metrics.addr 0.0.0.0 --metrics.port ${CHAIN_MONITOR_METRICS_PORT} --verbosity 3"` | | | defaultProbes.enabled | bool | `false` | | +| envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | | | env[0].name | string | `"CHAIN_MONITOR_SERVER_PORT"` | | | env[0].value | int | `8080` | | | env[1].name | string | `"CHAIN_MONITOR_METRICS_PORT"` | | @@ -35,9 +36,9 @@ Kubernetes: `>=1.22.0-0` | global.nameOverride | string | `"chain-monitor"` | | | image.pullPolicy | string | `"Always"` | | | image.repository | string | `"scrolltech/chain-monitorv2"` | | -| image.tag | string | `"v1.1.27"` | | +| image.tag | string | `"v1.1.28"` | | | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | | -| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | | +| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_CHAIN_MONITOR_DB_CONFIG_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | | initContainers.1-check-postgres-connection.args[3] | string | `"0"` | | | initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | | @@ -45,7 +46,8 @@ Kubernetes: `>=1.22.0-0` | initContainers.2-migrate-db.command[0] | string | `"/bin/sh"` | | | initContainers.2-migrate-db.command[1] | string | `"-c"` | | | initContainers.2-migrate-db.command[2] | string | `"chain-monitor --config /app/config/chain-monitor-config.json --db --db.migrate"` | | -| initContainers.2-migrate-db.image | string | `"scrolltech/chain-monitorv2:v1.1.26"` | | +| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | | +| initContainers.2-migrate-db.image | string | `"scrolltech/chain-monitorv2:v1.1.28"` | | | initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/app/config/"` | | | initContainers.2-migrate-db.volumeMounts[0].name | string | `"chain-monitor"` | | | initContainers.3-wait-for-l1.command[0] | string | `"/bin/sh"` | | diff --git a/charts/chain-monitor/values.yaml b/charts/chain-monitor/values.yaml index 65da2a50..23544670 100644 --- a/charts/chain-monitor/values.yaml +++ b/charts/chain-monitor/values.yaml @@ -6,7 +6,7 @@ global: image: repository: scrolltech/chain-monitorv2 pullPolicy: Always - tag: v1.1.27 + tag: v1.1.28 env: - name: CHAIN_MONITOR_SERVER_PORT @@ -14,6 +14,10 @@ env: - name: CHAIN_MONITOR_METRICS_PORT value: 8090 +envFrom: + - configMapRef: + name: chain-monitor-env + command: [ "/bin/sh", @@ -71,14 +75,14 @@ initContainers: image: atkrad/wait4x:latest args: - postgresql - - $(DATABASE_URL) + - $(SCROLL_CHAIN_MONITOR_DB_CONFIG_DSN) - --timeout - "0" envFrom: - configMapRef: name: chain-monitor-env 2-migrate-db: - image: scrolltech/chain-monitorv2:v1.1.26 + image: scrolltech/chain-monitorv2:v1.1.28 command: - /bin/sh - -c @@ -86,6 +90,9 @@ initContainers: volumeMounts: - name: *app_name mountPath: /app/config/ + envFrom: + - configMapRef: + name: chain-monitor-env 3-wait-for-l1: image: scrolltech/scroll-alpine:v0.0.1 command: diff --git a/charts/contracts/Chart.yaml b/charts/contracts/Chart.yaml index 69aa8d95..f4537ff6 100644 --- a/charts/contracts/Chart.yaml +++ b/charts/contracts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: contracts helm charts name: contracts -version: 0.0.4 +version: 0.0.5 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/contracts/README.md b/charts/contracts/README.md index e36a4a88..c24981db 100644 --- a/charts/contracts/README.md +++ b/charts/contracts/README.md @@ -1,6 +1,6 @@ # contracts -![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) contracts helm charts @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"contracts-deployment-env"` | | | global.isStandalone | bool | `false` | | | image.repository | string | `"scrolltech/scroll-stack-contracts"` | | -| image.tag | string | `"deploy-v0.0.18"` | | +| image.tag | string | `"deploy-v0.0.19"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/contracts/values.yaml b/charts/contracts/values.yaml index 40299820..6e63369f 100644 --- a/charts/contracts/values.yaml +++ b/charts/contracts/values.yaml @@ -4,7 +4,7 @@ global: image: repository: scrolltech/scroll-stack-contracts - tag: deploy-v0.0.18 + tag: deploy-v0.0.19 envFrom: - configMapRef: diff --git a/charts/coordinator-cron/Chart.yaml b/charts/coordinator-cron/Chart.yaml index 0492f096..5e823f7e 100644 --- a/charts/coordinator-cron/Chart.yaml +++ b/charts/coordinator-cron/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: coordinator-cron helm charts name: coordinator-cron -version: 0.0.5 +version: 0.0.6 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/coordinator-cron/README.md b/charts/coordinator-cron/README.md index 3af17ef9..3fe1c377 100644 --- a/charts/coordinator-cron/README.md +++ b/charts/coordinator-cron/README.md @@ -1,6 +1,6 @@ # coordinator-cron -![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) coordinator-cron helm charts @@ -30,6 +30,7 @@ Kubernetes: `>=1.22.0-0` | defaultProbes.enabled | bool | `true` | | | defaultProbes.spec.httpGet.path | string | `"/health"` | | | defaultProbes.spec.httpGet.port | int | `8090` | | +| envFrom[0].configMapRef.name | string | `"coordinator-env"` | | | env[0].name | string | `"HTTP_PORT"` | | | env[0].value | string | `"8555"` | | | env[1].name | string | `"WS_PORT"` | | @@ -46,7 +47,7 @@ Kubernetes: `>=1.22.0-0` | image.repository | string | `"scrolltech/coordinator-cron"` | | | image.tag | string | `"v4.4.58"` | | | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | | -| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | | +| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_COORDINATOR_DB_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | | initContainers.1-check-postgres-connection.args[3] | string | `"0"` | | | initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"coordinator-env"` | | diff --git a/charts/coordinator-cron/values.yaml b/charts/coordinator-cron/values.yaml index f820e267..22901a50 100644 --- a/charts/coordinator-cron/values.yaml +++ b/charts/coordinator-cron/values.yaml @@ -20,6 +20,10 @@ env: - name: GIN_MODE value: "release" +envFrom: + - configMapRef: + name: coordinator-env + command: [ "/bin/sh", "-c", @@ -33,7 +37,7 @@ initContainers: image: atkrad/wait4x:latest args: - postgresql - - $(DATABASE_URL) + - $(SCROLL_COORDINATOR_DB_DSN) - --timeout - "0" envFrom: diff --git a/charts/gas-oracle/Chart.yaml b/charts/gas-oracle/Chart.yaml index bb761dd3..097fae0f 100644 --- a/charts/gas-oracle/Chart.yaml +++ b/charts/gas-oracle/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: gas-oracle helm charts name: gas-oracle -version: 0.0.5 +version: 0.0.6 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/gas-oracle/README.md b/charts/gas-oracle/README.md index 2d2dcc6c..a157d0c8 100644 --- a/charts/gas-oracle/README.md +++ b/charts/gas-oracle/README.md @@ -1,6 +1,6 @@ # gas-oracle -![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) gas-oracle helm charts @@ -32,6 +32,7 @@ Kubernetes: `>=1.22.0-0` | defaultProbes.enabled | bool | `true` | | | defaultProbes.spec.httpGet.path | string | `"/health"` | | | defaultProbes.spec.httpGet.port | int | `8090` | | +| envFrom[0].configMapRef.name | string | `"gas-oracle-env"` | | | env[0].name | string | `"METRICS_PORT"` | | | env[0].value | int | `8090` | | | global.fullnameOverride | string | `"gas-oracle"` | | @@ -40,7 +41,7 @@ Kubernetes: `>=1.22.0-0` | image.repository | string | `"scrolltech/gas-oracle"` | | | image.tag | string | `"v4.4.59"` | | | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | | -| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | | +| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_ROLLUP_DB_CONFIG_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | | initContainers.1-check-postgres-connection.args[3] | string | `"0"` | | | initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"gas-oracle-env"` | | diff --git a/charts/gas-oracle/values.yaml b/charts/gas-oracle/values.yaml index fe85ba49..34ab83ab 100644 --- a/charts/gas-oracle/values.yaml +++ b/charts/gas-oracle/values.yaml @@ -82,12 +82,16 @@ env: - name: METRICS_PORT value: 8090 +envFrom: + - configMapRef: + name: gas-oracle-env + initContainers: 1-check-postgres-connection: image: atkrad/wait4x:latest args: - postgresql - - $(DATABASE_URL) + - $(SCROLL_ROLLUP_DB_CONFIG_DSN) - --timeout - "0" envFrom: diff --git a/charts/rollup-node/Chart.yaml b/charts/rollup-node/Chart.yaml index 6d6ff9f2..99ebaa0e 100644 --- a/charts/rollup-node/Chart.yaml +++ b/charts/rollup-node/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: rollup-node helm charts name: rollup-node -version: 0.0.7 +version: 0.0.8 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/rollup-node/README.md b/charts/rollup-node/README.md index d0076f15..f6d6aa67 100644 --- a/charts/rollup-node/README.md +++ b/charts/rollup-node/README.md @@ -1,6 +1,6 @@ # rollup-node -![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) rollup-node helm charts @@ -31,6 +31,7 @@ Kubernetes: `>=1.22.0-0` | controller.replicas | int | `1` | | | controller.strategy | string | `"Recreate"` | | | controller.type | string | `"deployment"` | | +| envFrom[0].configMapRef.name | string | `"rollup-node-env"` | | | env[0].name | string | `"METRICS_PORT"` | | | env[0].value | int | `8090` | | | global.fullnameOverride | string | `"rollup-node"` | | @@ -39,7 +40,7 @@ Kubernetes: `>=1.22.0-0` | image.repository | string | `"scrolltech/rollup-relayer"` | | | image.tag | string | `"v4.4.59"` | | | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | | -| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | | +| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_ROLLUP_DB_CONFIG_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | | initContainers.1-check-postgres-connection.args[3] | string | `"0"` | | | initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"rollup-node-env"` | | diff --git a/charts/rollup-node/values.yaml b/charts/rollup-node/values.yaml index 6f431657..8c1a5559 100644 --- a/charts/rollup-node/values.yaml +++ b/charts/rollup-node/values.yaml @@ -17,6 +17,10 @@ env: - name: METRICS_PORT value: 8090 +envFrom: + - configMapRef: + name: rollup-node-env + command: [ "/bin/sh", "-c", @@ -85,7 +89,7 @@ initContainers: image: atkrad/wait4x:latest args: - postgresql - - $(DATABASE_URL) + - $(SCROLL_ROLLUP_DB_CONFIG_DSN) - --timeout - "0" envFrom: diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index 9d968d27..16def546 100644 --- a/charts/scroll-sdk/Chart.yaml +++ b/charts/scroll-sdk/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: scroll helm charts to deploy scroll sdk name: scroll-sdk -version: 0.0.24 +version: 0.0.25 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -26,11 +26,11 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout.enabled - name: bridge-history-api - version: 0.0.5 + version: 0.0.6 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: bridge-history-api.enabled - name: bridge-history-fetcher - version: 0.0.6 + version: 0.0.7 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: bridge-history-fetcher.enabled - name: blockscout-sc-verifier @@ -38,11 +38,11 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout-sc-verifier.enabled - name: chain-monitor - version: 0.0.4 + version: 0.0.5 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: chain-monitor.enabled - name: contracts - version: 0.0.4 + version: 0.0.5 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: contracts.enabled - name: coordinator-api @@ -50,7 +50,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: coordinator-api.enabled - name: coordinator-cron - version: 0.0.5 + version: 0.0.6 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: coordinator-cron.enabled - name: frontends @@ -58,7 +58,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: frontends.enabled - name: gas-oracle - version: 0.0.5 + version: 0.0.6 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: gas-oracle.enabled - name: l1-explorer @@ -98,7 +98,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: rollup-explorer-backend.enabled - name: rollup-node - version: 0.0.7 + version: 0.0.8 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: rollup-node.enabled - name: rpc-gateway diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md index 2212e58c..a56b11dc 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.0.24](https://img.shields.io/badge/Version-0.0.24-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.25](https://img.shields.io/badge/Version-0.0.25-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) scroll helm charts to deploy scroll sdk @@ -24,21 +24,21 @@ Kubernetes: `>=1.22.0-0` | oci://ghcr.io/scroll-tech/scroll-sdk/helm | balance-checker | 0.0.2 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.0.3 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout-sc-verifier | 0.0.2 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.5 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.6 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.4 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.4 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.6 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.7 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.5 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.5 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.0.6 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.0.5 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.0.6 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.0.5 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | gas-oracle | 0.0.5 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | gas-oracle | 0.0.6 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-devnet | 0.0.3 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.0.2 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-bootnode | 0.0.7 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.8 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.8 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-explorer-backend | 0.0.3 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.7 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.8 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rpc-gateway | 0.0.2 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 15.5.0 | diff --git a/devnet/Makefile b/devnet/Makefile index d275df21..d0a23500 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -13,7 +13,7 @@ bootstrap: config: echo "Creating configuration files..." - cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.18 + cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.19 echo "Creating env files..." ./create-env-files.sh scroll-sdk diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh index da175b95..1b812ac3 100755 --- a/devnet/create-env-files.sh +++ b/devnet/create-env-files.sh @@ -31,25 +31,22 @@ get_service_configmap_variables() { echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL" ;; bridge-history-api) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" ;; bridge-history-fetcher) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:DATABASE_URL" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" ;; chain-monitor) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC CHAIN_MONITOR_DB_CONNECTION_STRING:DATABASE_URL" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC CHAIN_MONITOR_DB_CONNECTION_STRING:SCROLL_CHAIN_MONITOR_DB_CONFIG_DSN" ;; contracts) echo "L1_RPC_ENDPOINT:L1_RPC_ENDPOINT L2_RPC_ENDPOINT:L2_RPC_ENDPOINT CHAIN_ID_L1:CHAIN_ID_L1 CHAIN_ID_L2:CHAIN_ID_L2" ;; coordinator) - echo "COORDINATOR_DB_CONNECTION_STRING:DATABASE_URL" - ;; - event-watcher) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC EVENT_WATCHER_DB_CONNECTION_STRING:DATABASE_URL" + echo "COORDINATOR_DB_CONNECTION_STRING:SCROLL_COORDINATOR_DB_DSN" ;; gas-oracle) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC GAS_ORACLE_DB_CONNECTION_STRING:DATABASE_URL" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC GAS_ORACLE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN" ;; l1-devnet) echo "CHAIN_ID_L1:CHAIN_ID" @@ -67,7 +64,7 @@ get_service_configmap_variables() { echo "CHAIN_ID_L2:CHAIN_ID L1_RPC_ENDPOINT:L2GETH_L1_ENDPOINT L2GETH_SIGNER_ADDRESS:L2GETH_SIGNER_ADDRESS L1_CONTRACT_DEPLOYMENT_BLOCK:L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK L2GETH_KEYSTORE:L2GETH_KEYSTORE L2GETH_PASSWORD:L2GETH_PASSWORD L2GETH_NODEKEY:L2GETH_NODEKEY" ;; rollup-node) - echo "L1_RPC_ENDPOINT:L1_RPC_ENDPOINT L2_RPC_ENDPOINT:L2_RPC_ENDPOINT ROLLUP_NODE_DB_CONNECTION_STRING:DATABASE_URL L1_SCROLL_CHAIN_PROXY_ADDR:L1_SCROLL_CHAIN_PROXY_ADDR" + echo "L1_RPC_ENDPOINT:L1_RPC_ENDPOINT L2_RPC_ENDPOINT:L2_RPC_ENDPOINT ROLLUP_NODE_DB_CONNECTION_STRING:SCROLL_ROLLUP_DB_CONFIG_DSN L1_SCROLL_CHAIN_PROXY_ADDR:L1_SCROLL_CHAIN_PROXY_ADDR" ;; *) echo "Service $service_name not found." @@ -145,7 +142,7 @@ extract_from_config_toml() { # List of services # Note: frontend is excluded from this list as its env file is generated by the container scroll-stack-contracts. -services_configmap=("balance-checker" "bridge-history-api" "bridge-history-fetcher" "blockscout" "chain-monitor" "contracts" "coordinator" "event-watcher" "gas-oracle" "l1-devnet" "l1-explorer" "l2-bootnode" "l2-rpc" "l2-sequencer" "rollup-node") +services_configmap=("balance-checker" "bridge-history-api" "bridge-history-fetcher" "blockscout" "chain-monitor" "contracts" "coordinator" "gas-oracle" "l1-devnet" "l1-explorer" "l2-bootnode" "l2-rpc" "l2-sequencer" "rollup-node") # Loop over the list of services and execute the function for service in "${services_configmap[@]}"; do From 401a9185a831d018ad98416d9692ada63bd8ac05 Mon Sep 17 00:00:00 2001 From: Morty Date: Thu, 5 Sep 2024 14:17:09 +0800 Subject: [PATCH 2/6] feat: enable relaxed block time --- charts/contracts/README.md | 2 +- charts/contracts/values.yaml | 2 +- devnet/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/contracts/README.md b/charts/contracts/README.md index c24981db..636128dd 100644 --- a/charts/contracts/README.md +++ b/charts/contracts/README.md @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"contracts-deployment-env"` | | | global.isStandalone | bool | `false` | | | image.repository | string | `"scrolltech/scroll-stack-contracts"` | | -| image.tag | string | `"deploy-v0.0.19"` | | +| image.tag | string | `"deploy-v0.0.20"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/contracts/values.yaml b/charts/contracts/values.yaml index 6e63369f..23c7c540 100644 --- a/charts/contracts/values.yaml +++ b/charts/contracts/values.yaml @@ -4,7 +4,7 @@ global: image: repository: scrolltech/scroll-stack-contracts - tag: deploy-v0.0.19 + tag: deploy-v0.0.20 envFrom: - configMapRef: diff --git a/devnet/Makefile b/devnet/Makefile index d0a23500..2f67229f 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -13,7 +13,7 @@ bootstrap: config: echo "Creating configuration files..." - cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.19 + cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.20 echo "Creating env files..." ./create-env-files.sh scroll-sdk From d2c3f4cc855f03cd3d6f21af9b6a07660a3f8240 Mon Sep 17 00:00:00 2001 From: Morty Date: Thu, 5 Sep 2024 16:21:48 +0800 Subject: [PATCH 3/6] fix: update chain-monitor version --- charts/chain-monitor/README.md | 2 +- charts/chain-monitor/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/chain-monitor/README.md b/charts/chain-monitor/README.md index 1705c606..b17002e2 100644 --- a/charts/chain-monitor/README.md +++ b/charts/chain-monitor/README.md @@ -36,7 +36,7 @@ Kubernetes: `>=1.22.0-0` | global.nameOverride | string | `"chain-monitor"` | | | image.pullPolicy | string | `"Always"` | | | image.repository | string | `"scrolltech/chain-monitorv2"` | | -| image.tag | string | `"v1.1.28"` | | +| image.tag | string | `"v1.1.29"` | | | initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | | | initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_CHAIN_MONITOR_DB_CONFIG_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | diff --git a/charts/chain-monitor/values.yaml b/charts/chain-monitor/values.yaml index 23544670..783ba328 100644 --- a/charts/chain-monitor/values.yaml +++ b/charts/chain-monitor/values.yaml @@ -6,7 +6,7 @@ global: image: repository: scrolltech/chain-monitorv2 pullPolicy: Always - tag: v1.1.28 + tag: v1.1.29 env: - name: CHAIN_MONITOR_SERVER_PORT From af204aca36cf2ca5c05502717c500c0a70f17a4c Mon Sep 17 00:00:00 2001 From: Morty Date: Thu, 5 Sep 2024 20:09:57 +0800 Subject: [PATCH 4/6] fix: update chain-monitor initContainer version --- charts/chain-monitor/README.md | 2 +- charts/chain-monitor/values.yaml | 2 +- devnet/create-env-files.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/chain-monitor/README.md b/charts/chain-monitor/README.md index b17002e2..5f90cd97 100644 --- a/charts/chain-monitor/README.md +++ b/charts/chain-monitor/README.md @@ -47,7 +47,7 @@ Kubernetes: `>=1.22.0-0` | initContainers.2-migrate-db.command[1] | string | `"-c"` | | | initContainers.2-migrate-db.command[2] | string | `"chain-monitor --config /app/config/chain-monitor-config.json --db --db.migrate"` | | | initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | | -| initContainers.2-migrate-db.image | string | `"scrolltech/chain-monitorv2:v1.1.28"` | | +| initContainers.2-migrate-db.image | string | `"scrolltech/chain-monitorv2:v1.1.29"` | | | initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/app/config/"` | | | initContainers.2-migrate-db.volumeMounts[0].name | string | `"chain-monitor"` | | | initContainers.3-wait-for-l1.command[0] | string | `"/bin/sh"` | | diff --git a/charts/chain-monitor/values.yaml b/charts/chain-monitor/values.yaml index 783ba328..f613f0af 100644 --- a/charts/chain-monitor/values.yaml +++ b/charts/chain-monitor/values.yaml @@ -82,7 +82,7 @@ initContainers: - configMapRef: name: chain-monitor-env 2-migrate-db: - image: scrolltech/chain-monitorv2:v1.1.28 + image: scrolltech/chain-monitorv2:v1.1.29 command: - /bin/sh - -c diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh index 1b812ac3..a387dd56 100755 --- a/devnet/create-env-files.sh +++ b/devnet/create-env-files.sh @@ -31,7 +31,7 @@ get_service_configmap_variables() { echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL" ;; bridge-history-api) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" ;; bridge-history-fetcher) echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" From e6aa3b03514b00c5a39d86da4e20d094851da59c Mon Sep 17 00:00:00 2001 From: Morty Date: Thu, 5 Sep 2024 20:11:42 +0800 Subject: [PATCH 5/6] fix: typo --- devnet/create-env-files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh index a387dd56..1b812ac3 100755 --- a/devnet/create-env-files.sh +++ b/devnet/create-env-files.sh @@ -31,7 +31,7 @@ get_service_configmap_variables() { echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL" ;; bridge-history-api) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" ;; bridge-history-fetcher) echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" From 7544440aea4c3966df1117ac30267e15df2b4355 Mon Sep 17 00:00:00 2001 From: Morty Date: Thu, 5 Sep 2024 20:25:57 +0800 Subject: [PATCH 6/6] fix: rename coordinator-env to coordinator-cron-env --- charts/coordinator-cron/README.md | 4 ++-- charts/coordinator-cron/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/coordinator-cron/README.md b/charts/coordinator-cron/README.md index 3fe1c377..43b07c05 100644 --- a/charts/coordinator-cron/README.md +++ b/charts/coordinator-cron/README.md @@ -30,7 +30,7 @@ Kubernetes: `>=1.22.0-0` | defaultProbes.enabled | bool | `true` | | | defaultProbes.spec.httpGet.path | string | `"/health"` | | | defaultProbes.spec.httpGet.port | int | `8090` | | -| envFrom[0].configMapRef.name | string | `"coordinator-env"` | | +| envFrom[0].configMapRef.name | string | `"coordinator-cron-env"` | | | env[0].name | string | `"HTTP_PORT"` | | | env[0].value | string | `"8555"` | | | env[1].name | string | `"WS_PORT"` | | @@ -50,7 +50,7 @@ Kubernetes: `>=1.22.0-0` | initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_COORDINATOR_DB_DSN)"` | | | initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | | | initContainers.1-check-postgres-connection.args[3] | string | `"0"` | | -| initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"coordinator-env"` | | +| initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"coordinator-cron-env"` | | | initContainers.1-check-postgres-connection.image | string | `"atkrad/wait4x:latest"` | | | persistence.app_name.enabled | bool | `true` | | | persistence.app_name.mountPath | string | `"/app/conf/"` | | diff --git a/charts/coordinator-cron/values.yaml b/charts/coordinator-cron/values.yaml index 22901a50..aafa996b 100644 --- a/charts/coordinator-cron/values.yaml +++ b/charts/coordinator-cron/values.yaml @@ -22,7 +22,7 @@ env: envFrom: - configMapRef: - name: coordinator-env + name: coordinator-cron-env command: [ "/bin/sh", @@ -42,7 +42,7 @@ initContainers: - "0" envFrom: - configMapRef: - name: coordinator-env + name: coordinator-cron-env resources: requests: