fix: lint

scroll-tech · Sep 11, 2024 · 46a953b · 46a953b
1 parent 16a5202
commit 46a953b
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 42 deletions.
diff --git a/charts/admin-system-backend/README.md b/charts/admin-system-backend/README.md
@@ -48,8 +48,8 @@ Kubernetes: `>=1.22.0-0`
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"scrolltech/scroll-admin-system"` |  |
 | image.tag | string | `"v0.1.0"` |  |
-| initContainers.1-wait-for-postgres.args[0] | string | `"tcp"` |  |
-| initContainers.1-wait-for-postgres.args[1] | string | `"$(DATABASE_HOST):$(DATABASE_PORT)"` |  |
+| initContainers.1-wait-for-postgres.args[0] | string | `"postgresql"` |  |
+| initContainers.1-wait-for-postgres.args[1] | string | `"$(SCROLL_ADMIN_AUTH_DB_CONFIG_DSN)"` |  |
 | initContainers.1-wait-for-postgres.args[2] | string | `"--timeout"` |  |
 | initContainers.1-wait-for-postgres.args[3] | string | `"0"` |  |
 | initContainers.1-wait-for-postgres.envFrom[0].configMapRef.name | string | `"admin-system-backend-env"` |  |
@@ -88,29 +88,30 @@ Kubernetes: `>=1.22.0-0`
 | initContainers.3-check-postgres-connection.image | string | `"atkrad/wait4x:latest"` |  |
 | initContainers.4-migrate-db.command[0] | string | `"/bin/sh"` |  |
 | initContainers.4-migrate-db.command[1] | string | `"-c"` |  |
-| initContainers.4-migrate-db.command[2] | string | `"ENV=fake CHAIN_ID=222222 db_cli migrate --config /app/config/admin-system-backend-config.json"` |  |
+| initContainers.4-migrate-db.command[2] | string | `"ENV=fake CHAIN_ID=222222"` |  |
+| initContainers.4-migrate-db.command[3] | string | `"db_cli migrate --config /app/config/admin-system-backend-config.json"` |  |
 | initContainers.4-migrate-db.image | string | `"scrolltech/scroll-admin-system:v0.1.0"` |  |
 | initContainers.4-migrate-db.volumeMounts[0].mountPath | string | `"/app/config/"` |  |
 | initContainers.4-migrate-db.volumeMounts[0].name | string | `"admin-system-backend"` |  |
-| persistence.app_name.enabled | string | `"yes"` |  |
+| persistence.app_name.enabled | bool | `true` |  |
 | persistence.app_name.mountPath | string | `"/app/config/"` |  |
 | persistence.app_name.name | string | `"admin-system-backend-config"` |  |
 | persistence.app_name.type | string | `"configMap"` |  |
-| persistence.genesis.enabled | string | `"yes"` |  |
+| persistence.genesis.enabled | bool | `true` |  |
 | persistence.genesis.mountPath | string | `"/app/genesis/"` |  |
 | persistence.genesis.name | string | `"genesis-config"` |  |
 | persistence.genesis.type | string | `"configMap"` |  |
 | persistence.init-db.defaultMode | string | `"0777"` |  |
-| persistence.init-db.enabled | string | `"yes"` |  |
+| persistence.init-db.enabled | bool | `true` |  |
 | persistence.init-db.mountPath | string | `"/init-db.sh"` |  |
 | persistence.init-db.name | string | `"init-db"` |  |
 | persistence.init-db.type | string | `"configMap"` |  |
-| persistence.model-conf.enabled | string | `"yes"` |  |
+| persistence.model-conf.enabled | bool | `true` |  |
 | persistence.model-conf.mountPath | string | `"/app/conf/model.conf"` |  |
 | persistence.model-conf.name | string | `"admin-system-backend-model-conf"` |  |
 | persistence.model-conf.subPath | string | `"model.conf"` |  |
 | persistence.model-conf.type | string | `"configMap"` |  |
-| persistence.policy-csv.enabled | string | `"yes"` |  |
+| persistence.policy-csv.enabled | bool | `true` |  |
 | persistence.policy-csv.mountPath | string | `"/app/conf/policy.csv"` |  |
 | persistence.policy-csv.name | string | `"admin-system-backend-policy-csv"` |  |
 | persistence.policy-csv.subPath | string | `"policy.csv"` |  |

diff --git a/charts/admin-system-backend/values.yaml b/charts/admin-system-backend/values.yaml
@@ -26,13 +26,13 @@ env:
     value: "222222"
 
 command: [
-    "/bin/sh",
-    "-c",
-    "scroll-admin-system --config /app/config/admin-system-backend-config.json \
-    --genesis /app/genesis/genesis.json \
-    --http.port ${HTTP_PORT} \
-    --metrics --metrics.port ${METRICS_PORT}",
-  ]
+  "/bin/sh",
+  "-c",
+  "scroll-admin-system --config /app/config/admin-system-backend-config.json \
+  --genesis /app/genesis/genesis.json \
+  --http.port ${HTTP_PORT} \
+  --metrics --metrics.port ${METRICS_PORT}",
+]
 
 resources:
   requests:
@@ -68,29 +68,29 @@ probes:
 
 persistence:
   *app_name:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /app/config/
     name: admin-system-backend-config
   genesis:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /app/genesis/
     name: genesis-config
   init-db:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /init-db.sh
     name: init-db
     defaultMode: "0777"
   model-conf:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /app/conf/model.conf
     subPath: model.conf
     name: admin-system-backend-model-conf
   policy-csv:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /app/conf/policy.csv
     subPath: policy.csv
@@ -100,8 +100,8 @@ initContainers:
   1-wait-for-postgres:
     image: atkrad/wait4x:latest
     args:
-      - tcp
-      - $(DATABASE_HOST):$(DATABASE_PORT)
+      - postgresql
+      - $(SCROLL_ADMIN_AUTH_DB_CONFIG_DSN)
       - --timeout
       - "0"
     envFrom:
@@ -139,7 +139,7 @@ initContainers:
           secretKeyRef:
             name: db-secrets
             key: ADMIN_SYSTEM_PASSWORD
-    command: ["bash","-c","./init-db.sh"]
+    command: ["bash", "-c", "./init-db.sh"]
     volumeMounts:
       - name: init-db
         mountPath: /init-db.sh
@@ -156,7 +156,12 @@ initContainers:
           name: admin-system-backend-env
   4-migrate-db:
     image: scrolltech/scroll-admin-system:v0.1.0
-    command: ["/bin/sh","-c","ENV=fake CHAIN_ID=222222 db_cli migrate --config /app/config/admin-system-backend-config.json"]
+    command: [
+      "/bin/sh",
+      "-c",
+      "ENV=fake CHAIN_ID=222222",
+      "db_cli migrate --config /app/config/admin-system-backend-config.json"
+    ]
     volumeMounts:
       - name: *app_name
         mountPath: /app/config/

diff --git a/charts/admin-system-cron/README.md b/charts/admin-system-cron/README.md
@@ -84,16 +84,17 @@ Kubernetes: `>=1.22.0-0`
 | initContainers.3-check-postgres-connection.image | string | `"atkrad/wait4x:latest"` |  |
 | initContainers.4-migrate-db.command[0] | string | `"/bin/sh"` |  |
 | initContainers.4-migrate-db.command[1] | string | `"-c"` |  |
-| initContainers.4-migrate-db.command[2] | string | `"ENV=fake CHAIN_ID=222222 db_cli migrate --config /app/config/admin-system-backend-config.json"` |  |
+| initContainers.4-migrate-db.command[2] | string | `"ENV=fake CHAIN_ID=222222"` |  |
+| initContainers.4-migrate-db.command[3] | string | `"db_cli migrate --config /app/config/admin-system-backend-config.json"` |  |
 | initContainers.4-migrate-db.image | string | `"scrolltech/scroll-admin-system:v0.1.0"` |  |
 | initContainers.4-migrate-db.volumeMounts[0].mountPath | string | `"/app/config/"` |  |
 | initContainers.4-migrate-db.volumeMounts[0].name | string | `"admin-system-cron"` |  |
-| persistence.app_name.enabled | string | `"yes"` |  |
+| persistence.app_name.enabled | bool | `true` |  |
 | persistence.app_name.mountPath | string | `"/app/config/"` |  |
 | persistence.app_name.name | string | `"admin-system-backend-config"` |  |
 | persistence.app_name.type | string | `"configMap"` |  |
 | persistence.init-db.defaultMode | string | `"0777"` |  |
-| persistence.init-db.enabled | string | `"yes"` |  |
+| persistence.init-db.enabled | bool | `true` |  |
 | persistence.init-db.mountPath | string | `"/init-db.sh"` |  |
 | persistence.init-db.name | string | `"init-db"` |  |
 | persistence.init-db.type | string | `"configMap"` |  |

diff --git a/charts/admin-system-cron/values.yaml b/charts/admin-system-cron/values.yaml
@@ -26,12 +26,12 @@ env:
     value: "release"
 
 command: [
-    "/bin/sh",
-    "-c",
-    "scroll-admin-cron --config /app/config/admin-system-backend-config.json \
-    --http.port ${HTTP_PORT} \
-    --metrics --metrics.port ${METRICS_PORT}",
-  ]
+  "/bin/sh",
+  "-c",
+  "scroll-admin-cron --config /app/config/admin-system-backend-config.json \
+  --http.port ${HTTP_PORT} \
+  --metrics --metrics.port ${METRICS_PORT}",
+]
 
 resources:
   requests:
@@ -66,12 +66,12 @@ probes:
 
 persistence:
   *app_name:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /app/config/
     name: admin-system-backend-config
   init-db:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /init-db.sh
     name: init-db
@@ -120,7 +120,7 @@ initContainers:
           secretKeyRef:
             name: db-secrets
             key: ADMIN_SYSTEM_PASSWORD
-    command: ["bash","-c","./init-db.sh"]
+    command: ["bash", "-c", "./init-db.sh"]
     volumeMounts:
       - name: init-db
         mountPath: /init-db.sh
@@ -137,7 +137,12 @@ initContainers:
           name: admin-system-backend-env
   4-migrate-db:
     image: scrolltech/scroll-admin-system:v0.1.0
-    command: ["/bin/sh","-c","ENV=fake CHAIN_ID=222222 db_cli migrate --config /app/config/admin-system-backend-config.json"]
+    command: [
+      "/bin/sh",
+      "-c",
+      "ENV=fake CHAIN_ID=222222",
+      "db_cli migrate --config /app/config/admin-system-backend-config.json"
+    ]
     volumeMounts:
       - name: *app_name
         mountPath: /app/config/

diff --git a/charts/admin-system-dashboard/README.md b/charts/admin-system-dashboard/README.md
@@ -46,7 +46,7 @@ Kubernetes: `>=1.22.0-0`
 | ingress.main.ingressClassName | string | `"nginx"` |  |
 | ingress.main.labels | object | `{}` |  |
 | ingress.main.primary | bool | `true` |  |
-| persistence.nginx.enabled | string | `"yes"` |  |
+| persistence.nginx.enabled | bool | `true` |  |
 | persistence.nginx.mountPath | string | `"/etc/nginx/conf.d"` |  |
 | persistence.nginx.name | string | `"admin-system-dashboard-nginx"` |  |
 | persistence.nginx.type | string | `"configMap"` |  |

diff --git a/charts/admin-system-dashboard/values.yaml b/charts/admin-system-dashboard/values.yaml
@@ -45,7 +45,7 @@ probes:
 
 persistence:
   nginx:
-    enabled: yes
+    enabled: true
     type: configMap
     mountPath: /etc/nginx/conf.d
     name: admin-system-dashboard-nginx

diff --git a/charts/rollup-node/README.md b/charts/rollup-node/README.md
@@ -83,7 +83,7 @@ Kubernetes: `>=1.22.0-0`
 | persistence.migrate-db.name | string | `"rollup-node-migrate-db"` |  |
 | persistence.migrate-db.type | string | `"configMap"` |  |
 | persistence.wait-for-contracts-script.defaultMode | string | `"0777"` |  |
-| persistence.wait-for-contracts-script.enabled | string | `"yes"` |  |
+| persistence.wait-for-contracts-script.enabled | bool | `true` |  |
 | persistence.wait-for-contracts-script.name | string | `"wait-for-contracts-script"` |  |
 | persistence.wait-for-contracts-script.type | string | `"configMap"` |  |
 | persistence.wait-for-l1-script.defaultMode | string | `"0777"` |  |

diff --git a/charts/rollup-node/values.yaml b/charts/rollup-node/values.yaml
@@ -79,7 +79,7 @@ persistence:
     name: wait-for-l1-script
     defaultMode: "0777"
   wait-for-contracts-script:
-    enabled: yes
+    enabled: true
     type: configMap
     name: wait-for-contracts-script
     defaultMode: "0777"

diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh
@@ -25,7 +25,7 @@ get_service_configmap_variables() {
     local service_name=$1
     case "$service_name" in
         admin-system-backend)
-            echo "ADMIN_SYSTEM_BACKEND_DB_CONNECTION_STRING:DATABASE_URL"
+            echo "ROLLUP_NODE_DB_CONNECTION_STRING:SCROLL_ADMIN_DB_CONFIG_DSN ROLLUP_NODE_DB_CONNECTION_STRING:SCROLL_ADMIN_READ_ONLY_DB_CONFIG_DSN ADMIN_SYSTEM_BACKEND_DB_CONNECTION_STRING:SCROLL_ADMIN_AUTH_DB_CONFIG_DSN"
             ;;
         balance-checker)
             echo "CHAIN_ID_L1:SCROLL_L1_RPC CHAIN_ID_L2:SCROLL_L2_RPC"