Skip to content

feat: remove dsn from config files #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 5, 2024
Merged

feat: remove dsn from config files #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ccd7eb
feat: remove dsn from config files
yiweichi Sep 4, 2024
401a918
feat: enable relaxed block time
yiweichi Sep 5, 2024
d2c3f4c
fix: update chain-monitor version
yiweichi Sep 5, 2024
af204ac
fix: update chain-monitor initContainer version
yiweichi Sep 5, 2024
e6aa3b0
fix: typo
yiweichi Sep 5, 2024
7544440
fix: rename coordinator-env to coordinator-cron-env
yiweichi Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/bridge-history-api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion charts/bridge-history-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"` | |
Expand Down
4 changes: 4 additions & 0 deletions charts/bridge-history-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/bridge-history-fetcher/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions charts/bridge-history-fetcher/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"` | |
Expand All @@ -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"` | |
Expand Down
6 changes: 5 additions & 1 deletion charts/bridge-history-fetcher/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ env:
- name: METRICS_PORT
value: "8090"

envFrom:
- configMapRef:
name: bridge-history-fetcher-env

service:
main:
enabled: true
Expand Down Expand Up @@ -82,7 +86,7 @@ initContainers:
image: atkrad/wait4x:latest
args:
- postgresql
- $(DATABASE_URL)
- $(SCROLL_BRIDGE_HISTORY_DB_DSN)
- --timeout
- "0"
envFrom:
Expand Down
2 changes: 1 addition & 1 deletion charts/chain-monitor/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 6 additions & 4 deletions charts/chain-monitor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"` | |
Expand All @@ -35,17 +36,18 @@ 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.29"` | |
| 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"` | |
| initContainers.1-check-postgres-connection.image | string | `"atkrad/wait4x:latest"` | |
| 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.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"` | |
Expand Down
13 changes: 10 additions & 3 deletions charts/chain-monitor/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ global:
image:
repository: scrolltech/chain-monitorv2
pullPolicy: Always
tag: v1.1.27
tag: v1.1.29

env:
- name: CHAIN_MONITOR_SERVER_PORT
value: 8080
- name: CHAIN_MONITOR_METRICS_PORT
value: 8090

envFrom:
- configMapRef:
name: chain-monitor-env

command:
[
"/bin/sh",
Expand Down Expand Up @@ -71,21 +75,24 @@ 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.29
command:
- /bin/sh
- -c
- chain-monitor --config /app/config/chain-monitor-config.json --db --db.migrate
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:
Expand Down
2 changes: 1 addition & 1 deletion charts/contracts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/contracts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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.20"` | |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
2 changes: 1 addition & 1 deletion charts/contracts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ global:

image:
repository: scrolltech/scroll-stack-contracts
tag: deploy-v0.0.18
tag: deploy-v0.0.20

envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/coordinator-cron/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions charts/coordinator-cron/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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-cron-env"` | |
| env[0].name | string | `"HTTP_PORT"` | |
| env[0].value | string | `"8555"` | |
| env[1].name | string | `"WS_PORT"` | |
Expand All @@ -46,10 +47,10 @@ 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"` | |
| 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/"` | |
Expand Down
8 changes: 6 additions & 2 deletions charts/coordinator-cron/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ env:
- name: GIN_MODE
value: "release"

envFrom:
- configMapRef:
name: coordinator-cron-env

command: [
"/bin/sh",
"-c",
Expand All @@ -33,12 +37,12 @@ initContainers:
image: atkrad/wait4x:latest
args:
- postgresql
- $(DATABASE_URL)
- $(SCROLL_COORDINATOR_DB_DSN)
- --timeout
- "0"
envFrom:
- configMapRef:
name: coordinator-env
name: coordinator-cron-env

resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion charts/gas-oracle/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions charts/gas-oracle/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"` | |
Expand All @@ -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"` | |
Expand Down
6 changes: 5 additions & 1 deletion charts/gas-oracle/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/rollup-node/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions charts/rollup-node/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"` | |
Expand All @@ -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"` | |
Expand Down
6 changes: 5 additions & 1 deletion charts/rollup-node/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ env:
- name: METRICS_PORT
value: 8090

envFrom:
- configMapRef:
name: rollup-node-env

command: [
"/bin/sh",
"-c",
Expand Down Expand Up @@ -85,7 +89,7 @@ initContainers:
image: atkrad/wait4x:latest
args:
- postgresql
- $(DATABASE_URL)
- $(SCROLL_ROLLUP_DB_CONFIG_DSN)
- --timeout
- "0"
envFrom:
Expand Down
Loading