Merge branch 'develop' into renovate/kube-prometheus-stack-59.x

.github/workflows/lint-test-charts.yml

@@ -2,6 +2,8 @@ name: Lint,test charts
 
 on:
   push:
+    paths:
+      - "charts/**"
 
 jobs:
   changed:

.gitignore

@@ -3,4 +3,5 @@
 .idea
 genesis.json
 config-contracts.toml
-charts/scroll-stack/*.json
+charts/scroll-stack/*.json
+.env.frontend

charts/scroll-stack/Chart.yaml

@@ -63,7 +63,7 @@ dependencies:
     condition: l2geth-rpc.enabled
   - name: grafana
     repository: "https://grafana.github.io/helm-charts"
-    version: 6.61.2
+    version: 7.3.11
     condition: grafana.enabled
   - name: l2geth-signer
     version: 0.0.1
@@ -74,7 +74,7 @@ dependencies:
     condition: loki-stack.enabled
   - name: postgresql
     repository: "oci://registry-1.docker.io/bitnamicharts"
-    version: 13.2.21
+    version: 13.4.6
     condition: postgresql.enabled
   - name: kube-prometheus-stack
     repository: "https://prometheus-community.github.io/helm-charts"

charts/scroll-stack/charts/blockscout-sc-verifier/values.yaml

@@ -11,7 +11,7 @@ controller:
 image:
   repository: ghcr.io/blockscout/smart-contract-verifier
   pullPolicy: Always
-  tag: v1.3.1
+  tag: v1.7.0
 
 env:
   - name: SMART_CONTRACT_VERIFIER__SERVER__HTTP__ENABLED

charts/scroll-stack/charts/frontends/values.yaml

@@ -12,6 +12,14 @@ image:
   pullPolicy: Always
   tag: 2.2.4
 
+command:
+  [
+    "/bin/bash",
+    "-c",
+    "cp /app/conf/.env.frontend /usr/share/nginx/html/.env && \
+    /usr/local/bin/entrypoint.sh"
+  ]
+
 service:
   main:
     enabled: true
@@ -28,6 +36,13 @@ resources:
     memory: "500Mi"
     cpu: "100m"
 
+persistence:
+  *app_name:
+    enabled: yes
+    type: configMap
+    mountPath: /app/conf/
+    name: frontends-config
+
 defaultProbes: &default_probes
   enabled: true
   custom: true

charts/scroll-stack/charts/l2geth-bootnode/values.yaml

@@ -61,7 +61,9 @@ command: ["bash",
     $METRICS_FLAGS \
     --txpool.globalqueue 4096 --txpool.globalslots 40960 --txpool.pricelimit \"$L2GETH_MIN_GAS_PRICE\" $LOCALS_FLAG \
     --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" \
-    --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" $L2GETH_EXTRA_PARAMS"
+    --miner.gasprice \"$L2GETH_MIN_GAS_PRICE\" --rpc.gascap 0 --gpo.ignoreprice \"$L2GETH_MIN_GAS_PRICE\" \ 
+    --metrics --metrics.expensive \
+    $L2GETH_EXTRA_PARAMS"
   ]
 
 defaultProbes: &default_probes
@@ -92,6 +94,7 @@ persistence:
     type: configMap
     mountPath: /l2geth/genesis/
     name: genesis-config
+
 service:
   main:
     enabled: true
@@ -101,4 +104,17 @@ service:
         port: 30303
       metrics:
         enabled: true
-        port: 8090
+        port: 6060
+        targetPort: 6060
+
+serviceMonitor:
+  main:
+    enabled: true
+    labels:
+      release: scroll-stack
+    serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+    endpoints:
+      - port: metrics
+        interval: 1m
+        scrapeTimeout: 10s
+        path: /debug/metrics/prometheus

charts/scroll-stack/charts/l2geth-rpc/values.yaml

@@ -25,7 +25,8 @@ service:
         port: &WS_PORT 8546
       metrics:
         enabled: true
-        port: 8090
+        port: 6060
+        targetPort: 6060
 
 defaultProbes: &default_probes
   enabled: true
@@ -101,6 +102,7 @@ command: ["bash",
     --gpo.blocks 100 \
     --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" \
     --rollup.verify \
+    --metrics --metrics.expensive \
     $L2GETH_EXTRA_PARAMS"
 ]
 
@@ -115,4 +117,16 @@ persistence:
     enabled: yes
     type: configMap
     mountPath: /l2geth/genesis/
-    name: genesis-config
+    name: genesis-config
+
+serviceMonitor:
+  main:
+    enabled: true
+    labels:
+      release: scroll-stack
+    serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+    endpoints:
+      - port: metrics
+        interval: 1m
+        scrapeTimeout: 10s
+        path: /debug/metrics/prometheus

charts/scroll-stack/charts/l2geth-signer/values.yaml

@@ -74,7 +74,7 @@ command: ["bash",
           --gpo.percentile 20 \
           --gpo.blocks 100 \
           --l1.endpoint \"$L2GETH_L1_ENDPOINT\" --l1.confirmations \"$L2GETH_L1_WATCHER_CONFIRMATIONS\" --l1.sync.startblock \"$L2GETH_L1_CONTRACT_DEPLOYMENT_BLOCK\" \
-          --rollup.verify 
+          --rollup.verify \
           --metrics --metrics.expensive \
           $L2GETH_EXTRA_PARAMS"]
 

charts/scroll-stack/templates/config-file-for-services.yaml

@@ -53,3 +53,14 @@ data:
 {{ (.Files.Glob "coordinator-config.json").AsConfig | indent 2 }}
 ---
 {{- end }}
+{{- if index .Values "frontends" "enabled" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "scroll-stack.labels" $ | nindent 4 }}
+  name: frontends-config
+data:
+{{ (.Files.Glob ".env.frontend").AsConfig | indent 2 }}
+---
+{{- end }}

readme.md

@@ -17,7 +17,7 @@ Run the following script to get the dependencies of each helm charts
 Run this command to generate config.toml file and genesis file
 ```bash
 cd charts/scroll-stack
-time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-e2b87879
+time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-2b5b82d4
 ```
 
 ## Launch scroll-stack