Skip to content

Commit bf24c97

Browse files
yiweichiyiweichi
authored
fix: remove private keys from config and clean up production.yaml (#164)
* feat: remove pk and dsn from configs * fix: update contract images * fix: override init containers for production
1 parent c441ddf commit bf24c97

File tree

19 files changed

+81
-45
lines changed

19 files changed

+81
-45
lines changed

‎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.7
5+
version: 0.0.8
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

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

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

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

55
bridge-history-fetcher helm charts
66

@@ -26,7 +26,7 @@ Kubernetes: `>=1.22.0-0`
2626
| command[0] | string | `"/bin/sh"` | |
2727
| command[1] | string | `"-c"` | |
2828
| command[2] | string | `"bridgehistoryapi-fetcher --config /app/conf/bridge-history-config.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | |
29-
| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n \"l1\": {},\n \"l2\": {},\n \"db\": {\n \"driver_name\": \"postgres\",\n \"maxOpenNum\": 50,\n \"maxIdleNume\": 5,\n \"dsn\": \"postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable\"\n }\n}\n"` | |
29+
| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n \"l1\": {},\n \"l2\": {},\n \"db\": {\n \"driver_name\": \"postgres\",\n \"maxOpenNum\": 50,\n \"maxIdleNume\": 5,\n \"dsn\": \"\"\n }\n}\n"` | |
3030
| configMaps.migrate-db.enabled | bool | `true` | |
3131
| controller.replicas | int | `1` | |
3232
| controller.strategy | string | `"RollingUpdate"` | |
@@ -52,7 +52,8 @@ Kubernetes: `>=1.22.0-0`
5252
| initContainers.2-migrate-db.command[0] | string | `"/bin/sh"` | |
5353
| initContainers.2-migrate-db.command[1] | string | `"-c"` | |
5454
| initContainers.2-migrate-db.command[2] | string | `"db_cli --config /config/migrate-db.json migrate"` | |
55-
| initContainers.2-migrate-db.image | string | `"scrolltech/bridgehistoryapi-db-cli:v4.4.14"` | |
55+
| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` | |
56+
| initContainers.2-migrate-db.image | string | `"scrolltech/bridgehistoryapi-db-cli:v4.4.59"` | |
5657
| initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` | |
5758
| initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` | |
5859
| initContainers.2-migrate-db.volumeMounts[0].subPath | string | `"migrate-db.json"` | |

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,15 @@ initContainers:
9393
- configMapRef:
9494
name: bridge-history-fetcher-env
9595
2-migrate-db:
96-
image: scrolltech/bridgehistoryapi-db-cli:v4.4.14
96+
image: scrolltech/bridgehistoryapi-db-cli:v4.4.59
9797
command: ["/bin/sh", "-c", "db_cli --config /config/migrate-db.json migrate"]
9898
volumeMounts:
9999
- name: migrate-db
100100
mountPath: /config/migrate-db.json
101101
subPath: migrate-db.json
102+
envFrom:
103+
- configMapRef:
104+
name: bridge-history-fetcher-env
102105
3-wait-for-l1:
103106
image: scrolltech/scroll-alpine:v0.0.1
104107
command:
@@ -137,7 +140,7 @@ configMaps:
137140
"driver_name": "postgres",
138141
"maxOpenNum": 50,
139142
"maxIdleNume": 5,
140-
"dsn": "postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable"
143+
"dsn": ""
141144
}
142145
}
143146

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,23 @@ initContainers:
3030
envFrom:
3131
- secretRef:
3232
name: bridge-history-fetcher-secret-env
33+
2-migrate-db:
34+
image: scrolltech/bridgehistoryapi-db-cli:v4.4.59
35+
command: ["/bin/sh", "-c", "db_cli --config /config/migrate-db.json migrate"]
36+
volumeMounts:
37+
- name: migrate-db
38+
mountPath: /config/migrate-db.json
39+
subPath: migrate-db.json
40+
envFrom:
41+
- configMapRef:
42+
name: bridge-history-fetcher-secret-env
3343

3444
configMaps:
3545
env:
3646
enabled: true
3747
data:
3848
SCROLL_L1_RPC: ""
3949
SCROLL_L2_RPC: "http://l2-rpc:8545"
40-
migrate-db:
41-
enabled: false
4250

4351
ingress:
4452
main:

‎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.5
5+
version: 0.0.6
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

‎charts/contracts/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# contracts
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
contracts helm charts
66

@@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0`
2525
| envFrom[0].configMapRef.name | string | `"contracts-deployment-env"` | |
2626
| global.isStandalone | bool | `false` | |
2727
| image.repository | string | `"scrolltech/scroll-stack-contracts"` | |
28-
| image.tag | string | `"deploy-v0.0.20"` | |
28+
| image.tag | string | `"deploy-v0.0.21"` | |
2929

3030
----------------------------------------------
3131
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

‎charts/contracts/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ global:
44

55
image:
66
repository: scrolltech/scroll-stack-contracts
7-
tag: deploy-v0.0.20
7+
tag: deploy-v0.0.21
88

99
envFrom:
1010
- configMapRef:

‎charts/gas-oracle/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: gas-oracle helm charts
44
name: gas-oracle
5-
version: 0.0.6
5+
version: 0.0.7
66
appVersion: v0.1.0
77
kubeVersion: ">=1.22.0-0"
88
maintainers:

‎charts/gas-oracle/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# gas-oracle
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
gas-oracle helm charts
66

@@ -26,7 +26,7 @@ Kubernetes: `>=1.22.0-0`
2626
| command[0] | string | `"/bin/sh"` | |
2727
| command[1] | string | `"-c"` | |
2828
| command[2] | string | `"gas_oracle --config /app/conf/rollup-config.json --genesis /app/genesis/genesis.json --metrics --metrics.addr 0.0.0.0 --metrics.port ${METRICS_PORT} --log.debug"` | |
29-
| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n \"driver_name\": \"postgres\",\n \"dsn\": \"postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable\"\n}\n"` | |
29+
| configMaps.migrate-db.data."migrate-db.json" | string | `"{\n \"driver_name\": \"postgres\",\n \"dsn\": \"\"\n}\n"` | |
3030
| configMaps.migrate-db.enabled | bool | `true` | |
3131
| defaultProbes.custom | bool | `true` | |
3232
| defaultProbes.enabled | bool | `true` | |
@@ -39,7 +39,7 @@ Kubernetes: `>=1.22.0-0`
3939
| global.nameOverride | string | `"gas-oracle"` | |
4040
| image.pullPolicy | string | `"Always"` | |
4141
| image.repository | string | `"scrolltech/gas-oracle"` | |
42-
| image.tag | string | `"v4.4.59"` | |
42+
| image.tag | string | `"v4.4.60"` | |
4343
| initContainers.1-check-postgres-connection.args[0] | string | `"postgresql"` | |
4444
| initContainers.1-check-postgres-connection.args[1] | string | `"$(SCROLL_ROLLUP_DB_CONFIG_DSN)"` | |
4545
| initContainers.1-check-postgres-connection.args[2] | string | `"--timeout"` | |
@@ -49,7 +49,8 @@ Kubernetes: `>=1.22.0-0`
4949
| initContainers.2-migrate-db.command[0] | string | `"/bin/sh"` | |
5050
| initContainers.2-migrate-db.command[1] | string | `"-c"` | |
5151
| initContainers.2-migrate-db.command[2] | string | `"db_cli migrate --config /config/migrate-db.json"` | |
52-
| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli"` | |
52+
| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"gas-oracle-env"` | |
53+
| initContainers.2-migrate-db.image | string | `"scrolltech/rollup-db-cli:v4.4.60"` | |
5354
| initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` | |
5455
| initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` | |
5556
| initContainers.2-migrate-db.volumeMounts[0].subPath | string | `"migrate-db.json"` | |

‎charts/gas-oracle/values.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ global:
66
image:
77
repository: scrolltech/gas-oracle
88
pullPolicy: Always
9-
tag: v4.4.59
9+
tag: v4.4.60
1010

1111
command:
1212
[
@@ -98,12 +98,15 @@ initContainers:
9898
- configMapRef:
9999
name: gas-oracle-env
100100
2-migrate-db:
101-
image: scrolltech/rollup-db-cli
101+
image: scrolltech/rollup-db-cli:v4.4.60
102102
command: ["/bin/sh", "-c", "db_cli migrate --config /config/migrate-db.json"]
103103
volumeMounts:
104104
- name: migrate-db
105105
mountPath: /config/migrate-db.json
106106
subPath: migrate-db.json
107+
envFrom:
108+
- configMapRef:
109+
name: gas-oracle-env
107110
3-wait-for-l1:
108111
image: scrolltech/scroll-alpine:v0.0.1
109112
command:
@@ -134,7 +137,7 @@ configMaps:
134137
migrate-db.json: |
135138
{
136139
"driver_name": "postgres",
137-
"dsn": "postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable"
140+
"dsn": ""
138141
}
139142
140143
serviceMonitor:

0 commit comments

Comments
 (0)