[BLOCK-2358] improve substreams chart (#14)

* [BLOCK-2358] improve substreams chart
ultraio · Jul 16, 2024 · 7ed9f5d · 7ed9f5d
1 parent 43ad631
commit 7ed9f5d
Show file tree

Hide file tree

Showing 24 changed files with 445 additions and 474 deletions.
diff --git a/charts/firehose-antelope/Chart.yaml b/charts/firehose-antelope/Chart.yaml
@@ -3,24 +3,24 @@ appVersion: 0.1.0
 description: A Helm chart for firehose-antelope components
 name: firehose-antelope
 type: application
-version: 1.0.5
+version: 1.1.0
 
 dependencies:
   - name: reader-node
-    version: 0.1.0
+    version: 0.1.1
     repository: file://charts/reader-node
   - name: merger
-    version: 0.1.0
+    version: 0.1.1
     repository: file://charts/merger
   - name: relayer
-    version: 0.1.0
+    version: 0.1.1
     repository: file://charts/relayer
   - name: substreams-tier1
-    version: 0.1.0
+    version: 0.1.1
     repository: file://charts/substreams-tier1
   - name: substreams-tier2
-    version: 0.1.0
+    version: 0.1.1
     repository: file://charts/substreams-tier2
   - name: firehose
-    version: 0.1.0
+    version: 0.1.1
     repository: file://charts/firehose
diff --git a/charts/firehose-antelope/charts/firehose/Chart.yaml b/charts/firehose-antelope/charts/firehose/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: v1.3.2-1.0.2
 description: A Helm chart for firehose gRPC
 name: firehose
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/charts/firehose-antelope/charts/firehose/templates/statefulset.yaml b/charts/firehose-antelope/charts/firehose/templates/statefulset.yaml
@@ -23,8 +23,8 @@ spec:
       serviceAccountName: "{{ .Values.statefulset.serviceAccountName }}"
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.firehoseTag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.global.image.pullPolicy }}
           command:
             - "/app/fireantelope"
             - "start"
@@ -35,9 +35,9 @@ spec:
             - "--common-auth-plugin={{ .Values.statefulset.commonAuthPlugin }}"
             - "--common-live-blocks-addr={{ .Values.statefulset.commonLiveBlocksAddr }}"
             - "--common-system-shutdown-signal-delay={{ .Values.statefulset.commonSystemShutdownSignalDelay }}"
-            - "--common-merged-blocks-store-url={{ .Values.statefulset.commonMergedBlocksStoreUrl }}"
-            - "--common-one-block-store-url={{ .Values.statefulset.commonOneBlockStoreUrl }}"
-            - "--common-forked-blocks-store-url={{ .Values.statefulset.commonForkedBlocksStoreUrl }}"
+            - "--common-merged-blocks-store-url={{ .Values.global.store.commonMergedBlocksStoreUrl }}"
+            - "--common-one-block-store-url={{ .Values.global.store.commonOneBlockStoreUrl }}"
+            - "--common-forked-blocks-store-url={{ .Values.global.store.commonForkedBlocksStoreUrl }}"
             - "--firehose-grpc-listen-addr={{ .Values.statefulset.firehoseGrpcListenAddr }}"
             {{- with .Values.statefulset.extraCommands }}
               {{- toYaml . | nindent 14 }}

diff --git a/charts/firehose-antelope/charts/firehose/values.yaml b/charts/firehose-antelope/charts/firehose/values.yaml
@@ -21,9 +21,6 @@ statefulset:
   commonAuthPlugin: null://
   commonLiveBlocksAddr: dns:///relayer:9000
   commonSystemShutdownSignalDelay: 30s
-  commonMergedBlocksStoreUrl: ""
-  commonOneBlockStoreUrl: ""
-  commonForkedBlocksStoreUrl: ""
   firehoseGrpcListenAddr: :9000
   extraCommands: []
   # ports
@@ -54,6 +51,7 @@ localVolume:
 service:
   labels:
     monitoring: "true"
+    monitor: prometheus
   type: ClusterIP
   ports:
     - protocol: TCP

diff --git a/charts/firehose-antelope/charts/merger/Chart.yaml b/charts/firehose-antelope/charts/merger/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: v1.3.2-1.0.2
 description: A Helm chart for merger
 name: merger
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/charts/firehose-antelope/charts/merger/templates/statefulset.yaml b/charts/firehose-antelope/charts/merger/templates/statefulset.yaml
@@ -23,18 +23,18 @@ spec:
       serviceAccountName: "{{ .Values.statefulset.serviceAccountName }}"
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.firehoseTag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.global.image.pullPolicy }}
           command:
             - "/app/fireantelope"
             - "start"
             - "merger"
             - "--config-file="
             - "--log-format=stackdriver"
             - "--log-to-file=false"
-            - "--common-merged-blocks-store-url={{ .Values.statefulset.commonMergedBlocksStoreUrl }}"
-            - "--common-one-block-store-url={{ .Values.statefulset.commonOneBlockStoreUrl }}"
-            - "--common-forked-blocks-store-url={{ .Values.statefulset.commonForkedBlocksStoreUrl }}"
+            - "--common-merged-blocks-store-url={{ .Values.global.store.commonMergedBlocksStoreUrl }}"
+            - "--common-one-block-store-url={{ .Values.global.store.commonOneBlockStoreUrl }}"
+            - "--common-forked-blocks-store-url={{ .Values.global.store.commonForkedBlocksStoreUrl }}"
             - "--merger-grpc-listen-addr={{ .Values.statefulset.mergerGrpcListenAddr }}"
             - "--merger-prune-forked-blocks-after={{ .Values.statefulset.mergerPruneForkedBlocksAfter }}"
             - "--merger-stop-block={{ .Values.statefulset.mergerStopBlock }}"

diff --git a/charts/firehose-antelope/charts/merger/values.yaml b/charts/firehose-antelope/charts/merger/values.yaml
@@ -18,9 +18,6 @@ statefulset:
   enabled: true
   serviceAccountName: ""
   # commands
-  commonMergedBlocksStoreUrl: ""
-  commonOneBlockStoreUrl: ""
-  commonForkedBlocksStoreUrl: ""
   mergerGrpcListenAddr: :9000
   mergerPruneForkedBlocksAfter: 2000
   mergerStopBlock: 0
@@ -60,6 +57,7 @@ localVolume:
 service:
   labels:
     monitoring: "true"
+    monitor: prometheus
   type: ClusterIP
   ports:
     - protocol: TCP

diff --git a/charts/firehose-antelope/charts/reader-node/Chart.yaml b/charts/firehose-antelope/charts/reader-node/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: v1.3.2-1.0.2-nodeos3.2.5-2.0.4
 description: A Helm chart for reader-node
 name: reader-node
 type: application
-version: 0.1.0
+version: 0.1.1