fix: production override init containers

scroll-tech · Sep 10, 2024 · feef3ec · feef3ec
1 parent 883124d
commit feef3ec
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 6 deletions.
diff --git 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.7
+version: 0.0.8
 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
@@ -1,6 +1,6 @@
 # bridge-history-fetcher
 
-![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)
 
 bridge-history-fetcher helm charts
 
@@ -26,7 +26,7 @@ Kubernetes: `>=1.22.0-0`
 | command[0] | string | `"/bin/sh"` |  |
 | command[1] | string | `"-c"` |  |
 | 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"` |  |
-| 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"` |  |
+| 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"` |  |
 | configMaps.migrate-db.enabled | bool | `true` |  |
 | controller.replicas | int | `1` |  |
 | controller.strategy | string | `"RollingUpdate"` |  |
@@ -52,6 +52,7 @@ 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 | `"db_cli --config /config/migrate-db.json migrate"` |  |
+| initContainers.2-migrate-db.envFrom[0].configMapRef.name | string | `"bridge-history-fetcher-env"` |  |
 | initContainers.2-migrate-db.image | string | `"scrolltech/bridgehistoryapi-db-cli:v4.4.14"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].mountPath | string | `"/config/migrate-db.json"` |  |
 | initContainers.2-migrate-db.volumeMounts[0].name | string | `"migrate-db"` |  |

diff --git a/charts/bridge-history-fetcher/values.yaml b/charts/bridge-history-fetcher/values.yaml
@@ -99,6 +99,9 @@ initContainers:
       - name: migrate-db
         mountPath: /config/migrate-db.json
         subPath: migrate-db.json
+    envFrom:
+      - configMapRef:
+          name: bridge-history-fetcher-env
   3-wait-for-l1:
     image: scrolltech/scroll-alpine:v0.0.1
     command:
@@ -137,7 +140,7 @@ configMaps:
             "driver_name": "postgres",
             "maxOpenNum": 50,
             "maxIdleNume": 5,
-            "dsn": "postgres://postgres:qwerty12345@postgresql:5432/scroll?sslmode=disable"
+            "dsn": ""
           }
         }
 

diff --git a/charts/bridge-history-fetcher/values/production.yaml b/charts/bridge-history-fetcher/values/production.yaml
@@ -30,6 +30,16 @@ initContainers:
     envFrom:
       - secretRef:
           name: bridge-history-fetcher-secret-env
+  2-migrate-db:
+    image: scrolltech/bridgehistoryapi-db-cli:v4.4.14
+    command: ["/bin/sh", "-c", "db_cli --config /config/migrate-db.json migrate"]
+    volumeMounts:
+      - name: migrate-db
+        mountPath: /config/migrate-db.json
+        subPath: migrate-db.json
+    envFrom:
+      - configMapRef:
+          name: bridge-history-fetcher-secret-env
 
 configMaps:
   env:

diff --git a/charts/gas-oracle/values/production.yaml b/charts/gas-oracle/values/production.yaml
@@ -30,6 +30,16 @@ initContainers:
     envFrom:
       - secretRef:
           name: gas-oracle-secret-env
+  2-migrate-db:
+    image: scrolltech/rollup-db-cli:v4.4.60
+    command: ["/bin/sh", "-c", "db_cli migrate --config /config/migrate-db.json"]
+    volumeMounts:
+      - name: migrate-db
+        mountPath: /config/migrate-db.json
+        subPath: migrate-db.json
+    envFrom:
+      - configMapRef:
+          name: gas-oracle-secret-env
   4-wait-for-l2-sequencer:
     image: atkrad/wait4x:latest
     args:

diff --git a/charts/rollup-node/values/production.yaml b/charts/rollup-node/values/production.yaml
@@ -12,6 +12,16 @@ initContainers:
     envFrom:
       - secretRef:
           name: rollup-node-secret-env
+  2-migrate-db:
+    image: scrolltech/rollup-db-cli:v4.4.60
+    command: ["/bin/sh", "-c", "db_cli migrate --config /config/migrate-db.json"]
+    volumeMounts:
+      - name: migrate-db
+        mountPath: /config/migrate-db.json
+        subPath: migrate-db.json
+    envFrom:
+      - secretRef:
+          name: rollup-node-secret-env
 
 envFrom:
   - secretRef:

diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml
@@ -30,7 +30,7 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: bridge-history-api.enabled
   - name: bridge-history-fetcher
-    version: 0.0.7
+    version: 0.0.8
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: bridge-history-fetcher.enabled
   - name: blockscout-sc-verifier

diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md
@@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0`
 | 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.6 |
-| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.7 |
+| oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.8 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.7 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.6 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.0.6 |