Merge pull request #7 from Blobscan/all-env-variables

Add all env vars

.pre-commit-config.yaml

@@ -1,4 +1,11 @@
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      # exclude: ^README.md|(?:tests/)/
+
   - repo: local
     hooks:
       - id: helm-docs

charts/blobscan-api/Chart.yaml

@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/Blobscan/blobscan/next/.github/assets/bl
 sources:
   - https://github.com/blobscan/blobscan/
 type: application
-version: 0.2.6
+version: 0.2.7
 maintainers:
   - name: PabloCastellano
     email: pablo@anche.no

charts/blobscan-api/README.md

@@ -1,7 +1,7 @@
 
 # blobscan-api
 
-![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Blobscan tRPC API
 
@@ -18,7 +18,7 @@ Blobscan tRPC API
 | affinity | object | `{}` | Affinity configuration for pods |
 | annotations | object | `{}` | Annotations for the Deployment |
 | args | list | `[]` | Command arguments |
-| config | object | `{"BEACON_NODE_ENDPOINT":"http://beacon-node:5052","CHAIN_ID":"1","DATABASE_URL":"postgresql://postgres:postgres@blobscan-blobscandb:5432/blobscan?ssl=false","SECRET_KEY":"supersecret"}` | Application configuration |
+| config | object | See `values.yaml` | Config file https://github.com/Blobscan/blobscan/blob/next/.env.example |
 | containerSecurityContext | object | See `values.yaml` | The security context for containers |
 | customArgs | list | `["api"]` | Custom args for the blobscan container |
 | customCommand | list | `[]` | Command replacement for the blobscan container |

charts/blobscan-api/templates/deployment.yaml

@@ -74,8 +74,6 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
-            - name: BLOBSCAN_API_PORT
-              value: {{ .Values.httpPort | quote }}
             - name: DATABASE_URL
               value: {{ .Values.config.DATABASE_URL | quote }}
             - name: SECRET_KEY
@@ -84,6 +82,36 @@ spec:
               value: {{ .Values.config.BEACON_NODE_ENDPOINT | quote }}
             - name: CHAIN_ID
               value: {{ .Values.config.CHAIN_ID | quote }}
+            - name: BLOBSCAN_API_PORT
+              value: {{ .Values.httpPort | quote }}
+            - name: POSTGRES_STORAGE_ENABLED
+              value: {{ .Values.config.POSTGRES_STORAGE_ENABLED | quote }}
+            - name: SWARM_STORAGE_ENABLED
+              value: {{ .Values.config.SWARM_STORAGE_ENABLED | quote }}
+            - name: GOOGLE_STORAGE_ENABLED
+              value: {{ .Values.config.GOOGLE_STORAGE_ENABLED | quote }}
+            - name: GOOGLE_STORAGE_BUCKET_NAME
+              value: {{ .Values.config.GOOGLE_STORAGE_BUCKET_NAME | quote }}
+            - name: GOOGLE_STORAGE_PROJECT_ID
+              value: {{ .Values.config.GOOGLE_STORAGE_PROJECT_ID | quote }}
+            - name: GOOGLE_SERVICE_KEY
+              value: {{ .Values.config.GOOGLE_SERVICE_KEY | quote }}
+            - name: OTLP_AUTH_USERNAME
+              value: {{ .Values.config.OTLP_AUTH_USERNAME | quote }}
+            - name: OTLP_AUTH_PASSWORD
+              value: {{ .Values.config.OTLP_AUTH_PASSWORD | quote }}
+            - name: OTEL_EXPORTER_OTLP_PROTOCOL
+              value: {{ .Values.config.OTEL_EXPORTER_OTLP_PROTOCOL | quote }}
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: {{ .Values.config.OTEL_EXPORTER_OTLP_ENDPOINT | quote }}
+            - name: METRICS_ENABLED
+              value: {{ .Values.config.METRICS_ENABLED | quote }}
+            - name: TRACES_ENABLED
+              value: {{ .Values.config.TRACES_ENABLED | quote }}
+            - name: BEE_DEBUG_ENDPOINT
+              value: {{ .Values.config.BEE_DEBUG_ENDPOINT | quote }}
+            - name: BEE_ENDPOINT
+              value: {{ .Values.config.BEE_ENDPOINT | quote }}
           {{- range $key, $value := .Values.secretEnv }}
             - name: {{ $key }}
               valueFrom:

charts/blobscan-api/values.yaml

@@ -24,12 +24,33 @@ httpPort: 3001
 # -- Command arguments
 args: []
 
-# -- Application configuration
+# -- Config file
+# @default -- See `values.yaml`
+# https://github.com/Blobscan/blobscan/blob/next/.env.example
 config:
   DATABASE_URL: "postgresql://postgres:postgres@blobscan-blobscandb:5432/blobscan?ssl=false"
   SECRET_KEY: "supersecret"
   BEACON_NODE_ENDPOINT: "http://beacon-node:5052"
   CHAIN_ID: "1"
+  BLOBSCAN_API_PORT: "3001"
+  # Storages
+  POSTGRES_STORAGE_ENABLED: "true"
+  SWARM_STORAGE_ENABLED: "false"
+  GOOGLE_STORAGE_ENABLED: "false"
+  # Google cloud storage specific
+  GOOGLE_STORAGE_BUCKET_NAME: ""
+  GOOGLE_STORAGE_PROJECT_ID: ""
+  GOOGLE_SERVICE_KEY: ""
+  # Opentelemetry
+  OTLP_AUTH_USERNAME: ""
+  OTLP_AUTH_PASSWORD: ""
+  OTEL_EXPORTER_OTLP_PROTOCOL: ""
+  OTEL_EXPORTER_OTLP_ENDPOINT: ""
+  METRICS_ENABLED: "true"
+  TRACES_ENABLED: "false"
+  # Swarm storage specific
+  BEE_DEBUG_ENDPOINT: "http://localhost:1635"
+  BEE_ENDPOINT: "http://localhost:1633"
 
 # -- Additional env variables
 extraEnv: []

charts/blobscan-indexer/Chart.yaml

@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/Blobscan/blobscan/next/.github/assets/bl
 sources:
   - https://github.com/blobscan/blobscan-indexer
 type: application
-version: 0.2.8
+version: 0.2.9
 maintainers:
   - name: PabloCastellano
     email: pablo@anche.no

charts/blobscan-indexer/README.md

@@ -1,7 +1,7 @@
 
 # blobscan-indexer
 
-![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Blobscan-indexer indexes blobs using Blobscan API.
 
@@ -18,7 +18,7 @@ Blobscan-indexer indexes blobs using Blobscan API.
 | affinity | object | `{}` | Affinity configuration for pods |
 | annotations | object | `{}` | Annotations for the Deployment |
 | args | list | `[]` | Command arguments |
-| config | object | `{"BEACON_NODE_ENDPOINT":"http://beacon-node:5052","BLOBSCAN_API_ENDPOINT":"http://blobscan-api:3001","EXECUTION_NODE_ENDPOINT":"http://execution-node:8545","SECRET_KEY":"supersecret","SENTRY_DSN":""}` | Application configuration |
+| config | object | See `values.yaml` | Config file https://github.com/Blobscan/blobscan/blob/next/.env.example |
 | containerSecurityContext | object | See `values.yaml` | The security context for containers |
 | customArgs | list | `[]` | Custom args for the blobscan-indexer container |
 | customCommand | list | `[]` | Command replacement for the blobscan-indexer container |

charts/blobscan-indexer/templates/deployment.yaml

@@ -77,6 +77,8 @@ spec:
               value: {{ .Values.config.EXECUTION_NODE_ENDPOINT | quote }}
             - name: SENTRY_DSN
               value: {{ .Values.config.SENTRY_DSN | quote }}
+            - name: RUST_LOG
+              value: {{ .Values.config.RUST_LOG | quote }}
           {{- range $key, $value := .Values.secretEnv }}
             - name: {{ $key }}
               valueFrom:

charts/blobscan-indexer/templates/service.yaml

@@ -12,4 +12,4 @@ spec:
     {{ toYaml .Values.extraPorts | nindent 4}}
   selector:
     {{- include "blobscan-indexer.selectorLabels" . | nindent 4 }}
-{{- end }}
+{{- end }}

charts/blobscan-indexer/values.yaml

@@ -21,13 +21,16 @@ secretEnv: {}
 # -- Command arguments
 args: []
 
-# -- Application configuration
+# -- Config file
+# @default -- See `values.yaml`
+# https://github.com/Blobscan/blobscan/blob/next/.env.example
 config:
   SECRET_KEY: "supersecret"
   BLOBSCAN_API_ENDPOINT: "http://blobscan-api:3001"
   BEACON_NODE_ENDPOINT: "http://beacon-node:5052"
   EXECUTION_NODE_ENDPOINT: "http://execution-node:8545"
   SENTRY_DSN: ""
+  RUST_LOG: "blob_indexer=INFO"
 
 # -- Additional env variables
 extraEnv: []

charts/blobscan/Chart.yaml

@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/Blobscan/blobscan/next/.github/assets/bl
 sources:
   - https://github.com/blobscan/blobscan/
 type: application
-version: 0.2.7
+version: 0.2.8
 maintainers:
   - name: PabloCastellano
     email: pablo@anche.no

charts/blobscan/README.md

@@ -1,7 +1,7 @@
 
 # blobscan
 
-![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Blobscan is the first blockchain explorer that helps to navigate and visualize those EIP-4844 blobs
 
@@ -36,7 +36,7 @@ Blobscan is the first blockchain explorer that helps to navigate and visualize t
 | blobscandb.persistence.enabled | bool | `true` |  |
 | blobscandb.persistence.size | string | `"8Gi"` |  |
 | blobscandb.pullPolicy | string | `"IfNotPresent"` |  |
-| config | object | `{"BEACON_NODE_ENDPOINT":"http://beacon-node:5052","DATABASE_URL":"postgresql://postgres:postgres@blobscan-blobscandb:5432/blobscan?schema=public","NEXTAUTH_URL":"http://localhost:3000","NEXT_PUBLIC_BEACON_BASE_URL":"https://dencun-devnet-8.beaconcha.in/","NEXT_PUBLIC_EXPLORER_BASE_URL":"https://explorer.dencun-devnet-8.ethpandaops.io","NEXT_PUBLIC_NETWORK_NAME":"mainnet","NODE_ENV":"","SECRET_KEY":"supersecret"}` | Application configuration |
+| config | object | See `values.yaml` | Config file https://github.com/Blobscan/blobscan/blob/next/.env.example |
 | containerSecurityContext | object | See `values.yaml` | The security context for containers |
 | customArgs | list | `["web"]` | Custom args for the blobscan container |
 | customCommand | list | `[]` | Command replacement for the blobscan container |

charts/blobscan/templates/deployment.yaml

@@ -76,8 +76,6 @@ spec:
           env:
             - name: DATABASE_URL
               value: {{ .Values.config.DATABASE_URL | quote }}
-            - name: NEXTAUTH_URL
-              value: {{ .Values.config.NEXTAUTH_URL | quote}}
             - name: SECRET_KEY
               value: {{ .Values.config.SECRET_KEY | quote}}
             - name: NEXT_PUBLIC_NETWORK_NAME
@@ -86,10 +84,32 @@ spec:
               value: {{ .Values.config.NEXT_PUBLIC_BEACON_BASE_URL | quote }}
             - name: NEXT_PUBLIC_EXPLORER_BASE_URL
               value: {{ .Values.config.NEXT_PUBLIC_EXPLORER_BASE_URL | quote }}
-            - name: BEACON_NODE_ENDPOINT
-              value: {{ .Values.config.BEACON_NODE_ENDPOINT | quote }}
-            - name: NODE_ENV
-              value: {{ .Values.config.NODE_ENV | quote }}
+            - name: CHAIN_ID
+              value: {{ .Values.config.CHAIN_ID | quote }}
+            - name: POSTGRES_STORAGE_ENABLED
+              value: {{ .Values.config.POSTGRES_STORAGE_ENABLED | quote }}
+            - name: SWARM_STORAGE_ENABLED
+              value: {{ .Values.config.SWARM_STORAGE_ENABLED | quote }}
+            - name: GOOGLE_STORAGE_ENABLED
+              value: {{ .Values.config.GOOGLE_STORAGE_ENABLED | quote }}
+            - name: GOOGLE_STORAGE_BUCKET_NAME
+              value: {{ .Values.config.GOOGLE_STORAGE_BUCKET_NAME | quote }}
+            - name: GOOGLE_STORAGE_PROJECT_ID
+              value: {{ .Values.config.GOOGLE_STORAGE_PROJECT_ID | quote }}
+            - name: GOOGLE_SERVICE_KEY
+              value: {{ .Values.config.GOOGLE_SERVICE_KEY | quote }}
+            - name: OTLP_AUTH_USERNAME
+              value: {{ .Values.config.OTLP_AUTH_USERNAME | quote }}
+            - name: OTLP_AUTH_PASSWORD
+              value: {{ .Values.config.OTLP_AUTH_PASSWORD | quote }}
+            - name: OTEL_EXPORTER_OTLP_PROTOCOL
+              value: {{ .Values.config.OTEL_EXPORTER_OTLP_PROTOCOL | quote }}
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: {{ .Values.config.OTEL_EXPORTER_OTLP_ENDPOINT | quote }}
+            - name: METRICS_ENABLED
+              value: {{ .Values.config.METRICS_ENABLED | quote }}
+            - name: TRACES_ENABLED
+              value: {{ .Values.config.TRACES_ENABLED | quote }}
           {{- range $key, $value := .Values.secretEnv }}
             - name: {{ $key }}
               valueFrom:

charts/blobscan/values.yaml

@@ -24,16 +24,33 @@ httpPort: 3000
 # -- Command arguments
 args: []
 
-# -- Application configuration
+
+# -- Config file
+# @default -- See `values.yaml`
+# https://github.com/Blobscan/blobscan/blob/next/.env.example
 config:
-  NEXTAUTH_URL: "http://localhost:3000"
   DATABASE_URL: "postgresql://postgres:postgres@blobscan-blobscandb:5432/blobscan?schema=public"
   SECRET_KEY: "supersecret"
   NEXT_PUBLIC_NETWORK_NAME: "mainnet"
-  NEXT_PUBLIC_BEACON_BASE_URL: "https://dencun-devnet-8.beaconcha.in/"
-  NEXT_PUBLIC_EXPLORER_BASE_URL: "https://explorer.dencun-devnet-8.ethpandaops.io"
-  BEACON_NODE_ENDPOINT: "http://beacon-node:5052"
-  NODE_ENV: ""
+  NEXT_PUBLIC_BEACON_BASE_URL: "https://beaconcha.in/"
+  NEXT_PUBLIC_EXPLORER_BASE_URL: "https://etherscan.io/"
+  CHAIN_ID: "1"
+  # Storages
+  POSTGRES_STORAGE_ENABLED: "true"
+  SWARM_STORAGE_ENABLED: "false"
+  GOOGLE_STORAGE_ENABLED: "false"
+  # GCS specific
+  GOOGLE_STORAGE_BUCKET_NAME: ""
+  GOOGLE_STORAGE_PROJECT_ID: ""
+  GOOGLE_SERVICE_KEY: ""
+  # Opentelemetry
+  OTLP_AUTH_USERNAME: ""
+  OTLP_AUTH_PASSWORD: ""
+  OTEL_EXPORTER_OTLP_PROTOCOL: ""
+  OTEL_EXPORTER_OTLP_ENDPOINT: ""
+  METRICS_ENABLED: "true"
+  TRACES_ENABLED: "false"
+
 
 # -- Additional env variables
 extraEnv: []