Skip to content

Commit ca468c8

Browse files
yiweichiyiweichi
authored
feat: remove dsn from config files (#153)
* feat: remove dsn from config files * feat: enable relaxed block time in genesis * fix: update chain-monitor version * fix: rename coordinator-env to coordinator-cron-env
1 parent f978b33 commit ca468c8

File tree

25 files changed

+90
-59
lines changed

25 files changed

+90
-59
lines changed

‎charts/bridge-history-api/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v2
33
description: bridge-history-api helm charts
44
name: bridge-history-api
5-
version: 0.0.5
5+
version: 0.0.6
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

‎charts/bridge-history-api/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# bridge-history-api
22

3-
![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)
3+
![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)
44

55
bridge-history-api helm charts
66

@@ -35,6 +35,7 @@ Kubernetes: `>=1.22.0-0`
3535
| defaultProbes.enabled | bool | `true` | |
3636
| defaultProbes.spec.httpGet.path | string | `"/health"` | |
3737
| defaultProbes.spec.httpGet.port | int | `8090` | |
38+
| envFrom[0].configMapRef.name | string | `"bridge-history-api-env"` | |
3839
| env[0].name | string | `"METRICS_PORT"` | |
3940
| env[0].value | string | `"8090"` | |
4041
| global.fullnameOverride | string | `"bridge-history-api"` | |

‎charts/bridge-history-api/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ env:
2323
- name: METRICS_PORT
2424
value: "8090"
2525

26+
envFrom:
27+
- configMapRef:
28+
name: bridge-history-api-env
29+
2630
initContainers:
2731
1-wait-for-l1:
2832
image: scrolltech/scroll-alpine:v0.0.1

‎charts/bridge-history-fetcher/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v2
33
description: bridge-history-fetcher helm charts
44
name: bridge-history-fetcher
5-
version: 0.0.6
5+
version: 0.0.7
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

‎charts/bridge-history-fetcher/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# bridge-history-fetcher
22

3-
![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)
3+
![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)
44

55
bridge-history-fetcher helm charts
66

@@ -35,6 +35,7 @@ Kubernetes: `>=1.22.0-0`
3535
| defaultProbes.enabled | bool | `true` | |
3636
| defaultProbes.spec.httpGet.path | string | `"/health"` | |
3737
| defaultProbes.spec.httpGet.port | int | `8090` | |
38+
| envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` | |
3839
| env[0].name | string | `"METRICS_PORT"` | |
3940
| env[0].value | string | `"8090"` | |
4041
| global.fullnameOverride | string | `"bridge-history-fetcher"` | |
@@ -43,7 +44,7 @@ Kubernetes: `>=1.22.0-0`
4344
| image.repository | string | `"scrolltech/bridgehistoryapi-fetcher"` | |
4445
| image.tag | string | `"v4.4.59"` | |
4546
| initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | |
46-
| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | |
47+
| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_BRIDGE_HISTORY_DB_DSN)"` | |
4748
| initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | |
4849
| initContainers.1-check-postgres-connection.args[3] | string | `"0"` | |
4950
| initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` | |

‎charts/bridge-history-fetcher/values.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ env:
2323
- name: METRICS_PORT
2424
value: "8090"
2525

26+
envFrom:
27+
- configMapRef:
28+
name: bridge-history-fetcher-env
29+
2630
service:
2731
main:
2832
enabled: true
@@ -82,7 +86,7 @@ initContainers:
8286
image: atkrad/wait4x:latest
8387
args:
8488
- postgresql
85-
- $(DATABASE_URL)
89+
- $(SCROLL_BRIDGE_HISTORY_DB_DSN)
8690
- --timeout
8791
- "0"
8892
envFrom:

‎charts/chain-monitor/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v2
33
description: chain-monitor helm charts
44
name: chain-monitor
5-
version: 0.0.4
5+
version: 0.0.5
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

‎charts/chain-monitor/README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# chain-monitor
22

3-
![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)
3+
![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)
44

55
chain-monitor helm charts
66

@@ -27,6 +27,7 @@ Kubernetes: `>=1.22.0-0`
2727
| command[1] | string | `"-c"` | |
2828
| 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"` | |
2929
| defaultProbes.enabled | bool | `false` | |
30+
| envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | |
3031
| env[0].name | string | `"CHAIN_MONITOR_SERVER_PORT"` | |
3132
| env[0].value | int | `8080` | |
3233
| env[1].name | string | `"CHAIN_MONITOR_METRICS_PORT"` | |
@@ -35,17 +36,18 @@ Kubernetes: `>=1.22.0-0`
3536
| global.nameOverride | string | `"chain-monitor"` | |
3637
| image.pullPolicy | string | `"Always"` | |
3738
| image.repository | string | `"scrolltech/chain-monitorv2"` | |
38-
| image.tag | string | `"v1.1.27"` | |
39+
| image.tag | string | `"v1.1.29"` | |
3940
| initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | |
40-
| initContainers.1-check-postgres-connection.args[1] | string | `"$(DATABASE_URL)"` | |
41+
| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_CHAIN_MONITOR_DB_CONFIG_DSN)"` | |
4142
| initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | |
4243
| initContainers.1-check-postgres-connection.args[3] | string | `"0"` | |
4344
| initContainers.1-check-postgres-connection.envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | |
4445
| initContainers.1-check-postgres-connection.image | string | `"atkrad/wait4x:latest"` | |
4546
| initContainers.2-migrate-db.command[0] | string | `"/bin/sh"` | |
4647
| initContainers.2-migrate-db.command[1] | string | `"-c"` | |
4748
| initContainers.2-migrate-db.command[2] | string | `"chain-monitor --config /app/config/chain-monitor-config.json --db --db.migrate"` | |
48-
| initContainers.2-migrate-db.image | string | `"scrolltech/chain-monitorv2:v1.1.26"` | |
49+
| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"chain-monitor-env"` | |
50+
| initContainers.2-migrate-db.image | string | `"scrolltech/chain-monitorv2:v1.1.29"` | |
4951
| initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/app/config/"` | |
5052
| initContainers.2-migrate-db.volumeMounts[0].name | string | `"chain-monitor"` | |
5153
| initContainers.3-wait-for-l1.command[0] | string | `"/bin/sh"` | |

‎charts/chain-monitor/values.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@ global:
66
image:
77
repository: scrolltech/chain-monitorv2
88
pullPolicy: Always
9-
tag: v1.1.27
9+
tag: v1.1.29
1010

1111
env:
1212
- name: CHAIN_MONITOR_SERVER_PORT
1313
value: 8080
1414
- name: CHAIN_MONITOR_METRICS_PORT
1515
value: 8090
1616

17+
envFrom:
18+
- configMapRef:
19+
name: chain-monitor-env
20+
1721
command:
1822
[
1923
"/bin/sh",
@@ -71,21 +75,24 @@ initContainers:
7175
image: atkrad/wait4x:latest
7276
args:
7377
- postgresql
74-
- $(DATABASE_URL)
78+
- $(SCROLL_CHAIN_MONITOR_DB_CONFIG_DSN)
7579
- --timeout
7680
- "0"
7781
envFrom:
7882
- configMapRef:
7983
name: chain-monitor-env
8084
2-migrate-db:
81-
image: scrolltech/chain-monitorv2:v1.1.26
85+
image: scrolltech/chain-monitorv2:v1.1.29
8286
command:
8387
- /bin/sh
8488
- -c
8589
- chain-monitor --config /app/config/chain-monitor-config.json --db --db.migrate
8690
volumeMounts:
8791
- name: *app_name
8892
mountPath: /app/config/
93+
envFrom:
94+
- configMapRef:
95+
name: chain-monitor-env
8996
3-wait-for-l1:
9097
image: scrolltech/scroll-alpine:v0.0.1
9198
command:

‎charts/contracts/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v2
33
description: contracts helm charts
44
name: contracts
5-
version: 0.0.4
5+
version: 0.0.5
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

0 commit comments

Comments
 (0)