[BLOCK-2252] update values and remove all Ultra specific configuration (

#3)
ultraio · Apr 15, 2024 · b6fd53a · b6fd53a
1 parent 226b71c
commit b6fd53a
Show file tree

Hide file tree

Showing 26 changed files with 251 additions and 278 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -34,10 +34,11 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --validate-maintainers=false --target-branch ${{ github.event.repository.default_branch }}
 
-      - name: Create kind cluster
-        if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/[email protected]
-
-      - name: Run chart-testing (install)
-        if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --target-branch ${{ github.event.repository.default_branch }}
+      # disabled for now
+      # - name: Create kind cluster
+      #   if: steps.list-changed.outputs.changed == 'true'
+      #   uses: helm/[email protected]
+
+      # - name: Run chart-testing (install)
+      #   if: steps.list-changed.outputs.changed == 'true'
+      #   run: ct install --target-branch ${{ github.event.repository.default_branch }}
diff --git a/charts/firehose-antelope/Chart.yaml b/charts/firehose-antelope/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 0.1.0
 description: A Helm chart for firehose-antelope components
 name: firehose-antelope
 type: application
-version: 0.2.21
+version: 1.0.0
 
 dependencies:
   - name: reader-node

diff --git a/charts/firehose-antelope/charts/firehose/Chart.yaml b/charts/firehose-antelope/charts/firehose/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.1.0
+appVersion: v1.3.2-1.0.2
 description: A Helm chart for firehose gRPC
 name: firehose
 type: application

diff --git a/charts/firehose-antelope/charts/firehose/templates/statefulset.yaml b/charts/firehose-antelope/charts/firehose/templates/statefulset.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: "{{ .Values.statefulset.serviceAccountName }}"
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - "/app/fireantelope"
@@ -32,13 +32,16 @@ spec:
             - "--config-file="
             - "--log-format=stackdriver"
             - "--log-to-file=false"
-            - "--common-auth-plugin={{ .Values.statefulset.authPlugin }}"
-            - "--common-live-blocks-addr={{ .Values.statefulset.liveBlocksAddr }}"
-            - "--common-system-shutdown-signal-delay=30s"
-            - "--common-merged-blocks-store-url={{ .Values.statefulset.mergedBlocksStoreURL }}"
-            - "--common-one-block-store-url={{ .Values.statefulset.oneBlockStoreURL }}"
-            - "--common-forked-blocks-store-url={{ .Values.statefulset.forkedBlocksStoreURL }}"
-            - "--firehose-grpc-listen-addr=:9000*"
+            - "--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 }}"
+            - "--firehose-grpc-listen-addr={{ .Values.statefulset.firehoseGrpcListenAddr }}"
+            {{- with .Values.statefulset.extraCommands }}
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
           {{- with .Values.statefulset.env }}
           env:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/firehose-antelope/charts/firehose/values.yaml b/charts/firehose-antelope/charts/firehose/values.yaml
@@ -5,39 +5,44 @@
 replicaCount: 2
 
 image:
-  repository: ""
+  repository: "quay.io/ultra.io/firehose-antelope"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 imagePullSecrets: []
 nameOverride: ""
-fullnameOverride: ""
+fullnameOverride: firehose
 
 statefulset:
   enabled: true
-  serviceAccountName: app-data-reader
+  serviceAccountName: ""
+  # commands
+  commonAuthPlugin: null://
+  commonLiveBlocksAddr: ns:///relayer:9000
+  commonSystemShutdownSignalDelay: 30s
+  commonMergedBlocksStoreUrl: ""
+  commonOneBlockStoreUrl: ""
+  commonForkedBlocksStoreUrl: ""
+  firehoseGrpcListenAddr: :9000
+  extraCommands: []
+  # ports
   ports:
     - name: grpc
       containerPort: 9000
       protocol: TCP
     - name: prometheus
       containerPort: 9102
       protocol: TCP
+  # env
   env:
     - name: INFO
       value: github.com/dfuse-io/.*
-  authPlugin: null://
-  liveBlocksAddr: dns:///relayer:9000
-  mergedBlocksStoreURL: ""
-  oneBlockStoreURL: ""
-  forkedBlocksStoreURL: ""
 
 ### Note: First port in list will be used as an Ingress port!
 service:
   labels:
     monitoring: "true"
-    monitor: prometheus
   type: ClusterIP
   ports:
     - protocol: TCP
@@ -79,4 +84,4 @@ autoscaling:
   enabled: false
 
 nodeSelector:
-  pool-id: batch-c2-4cores-16gb
+  role: application
diff --git a/charts/firehose-antelope/charts/merger/Chart.yaml b/charts/firehose-antelope/charts/merger/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.1.0
+appVersion: v1.3.2-1.0.2
 description: A Helm chart for merger
 name: merger
 type: application

diff --git a/charts/firehose-antelope/charts/merger/templates/statefulset.yaml b/charts/firehose-antelope/charts/merger/templates/statefulset.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: "{{ .Values.statefulset.serviceAccountName }}"
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - "/app/fireantelope"
@@ -32,13 +32,16 @@ spec:
             - "--config-file="
             - "--log-format=stackdriver"
             - "--log-to-file=false"
-            - "--common-merged-blocks-store-url={{ .Values.statefulset.blocksStoreURL }}"
-            - "--common-one-block-store-url={{ .Values.statefulset.oneBlockStoreURL }}"
-            - "--common-forked-blocks-store-url={{ .Values.statefulset.forkedBlocksStoreURL }}"
-            - "--merger-grpc-listen-addr=:9000"
-            - "--merger-prune-forked-blocks-after={{ .Values.statefulset.maxFixableFork }}"
-            - "--merger-stop-block=0"
-            - "--merger-time-between-store-lookups={{ .Values.statefulset.timeBetweenStoreLookups }}"
+            - "--common-merged-blocks-store-url={{ .Values.statefulset.commonMergedBlocksStoreUrl }}"
+            - "--common-one-block-store-url={{ .Values.statefulset.commonOneBlockStoreUrl }}"
+            - "--common-forked-blocks-store-url={{ .Values.statefulset.commonForkedBlocksStoreUrl }}"
+            - "--merger-grpc-listen-addr={{ .Values.statefulset.mergerGrpcListenAddr }}"
+            - "--merger-prune-forked-blocks-after={{ .Values.statefulset.mergerPruneForkedBlocksAfter }}"
+            - "--merger-stop-block={{ .Values.statefulset.mergerStopBlock }}"
+            - "--merger-time-between-store-lookups={{ .Values.statefulset.mergerTimeBetweenStoreLookups }}"
+            {{- with .Values.statefulset.extraCommands }}
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
           {{- with .Values.statefulset.env }}
           env:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/firehose-antelope/charts/merger/values.yaml b/charts/firehose-antelope/charts/merger/values.yaml
@@ -5,35 +5,32 @@
 replicaCount: 1
 
 image:
-  repository: ""
+  repository: "quay.io/ultra.io/firehose-antelope"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 imagePullSecrets: []
 nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: false
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
+fullnameOverride: merger
 
 statefulset:
   enabled: true
-  serviceAccountName: app-blocks-writer
-  blocksStoreURL: ""
-  oneBlockStoreURL: ""
-  forkedBlocksStoreURL: ""
-  maxFixableFork: 2000
-  timeBetweenStoreLookups: 5s
+  serviceAccountName: ""
+  # commands
+  commonMergedBlocksStoreUrl: ""
+  commonOneBlockStoreUrl: ""
+  commonForkedBlocksStoreUrl: ""
+  mergerGrpcListenAddr: :9000
+  mergerPruneForkedBlocksAfter: 2000
+  mergerStopBlock: 0
+  mergerTimeBetweenStoreLookups: 5s
+  extraCommands: []
+  # env
   env:
     - name: INFO
       value: ".*"
+  # ports
   ports:
     - containerPort: 9000
       name: grpc-endpoint
@@ -48,7 +45,6 @@ statefulset:
 service:
   labels:
     monitoring: "true"
-    monitor: prometheus
   type: ClusterIP
   ports:
     - protocol: TCP
@@ -86,4 +82,4 @@ pdb:
   maxUnavailable: 70%
 
 nodeSelector:
-  role: batch-c2-4cores-16gb
+  role: application
diff --git a/charts/firehose-antelope/charts/reader-node/Chart.yaml b/charts/firehose-antelope/charts/reader-node/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.1.0
+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

diff --git a/charts/firehose-antelope/charts/reader-node/templates/NOTES.txt b/charts/firehose-antelope/charts/reader-node/templates/NOTES.txt
@@ -1,11 +1,5 @@
 1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
+{{- if contains "NodePort" .Values.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "reader-node.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT

diff --git a/charts/firehose-antelope/charts/reader-node/templates/ingress.yaml b/charts/firehose-antelope/charts/reader-node/templates/ingress.yaml
diff --git a/charts/firehose-antelope/charts/reader-node/templates/statefulset.yaml b/charts/firehose-antelope/charts/reader-node/templates/statefulset.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: "{{ .Values.statefulset.serviceAccountName }}"
       containers:
         - name: "{{ .Values.statefulset.name }}"
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - "/app/fireantelope"
@@ -32,20 +32,23 @@ spec:
             - "--config-file="
             - "--log-format=stackdriver"
             - "--log-to-file=false"
-            - "--common-one-block-store-url={{ .Values.statefulset.oneBlockStoreURL }}"
-            - "--common-system-shutdown-signal-delay=20s"
-            - "--reader-node-arguments={{ .Values.statefulset.nodeosArguments }}"
-            - "--reader-node-blocks-chan-capacity=100"
-            - "--reader-node-data-dir=/nodeos-data"
-            - "--reader-node-debug-firehose-logs=false"
-            - "--reader-node-grpc-listen-addr=:9000"
-            - "--reader-node-manager-api-addr=:8080"
-            - "--reader-node-path=nodeos"
-            - "--reader-node-readiness-max-latency=5s"
-            - "--reader-node-start-block-num=0"
-            - "--reader-node-stop-block-num=0"
-            - "--reader-node-working-dir=/nodeos-data/reader/work"
-            - "--common-auto-mem-limit-percent={{ .Values.statefulset.autoMemLimitPercent }}"
+            - "--common-one-block-store-url={{ .Values.statefulset.commonOneBlockStoreURL }}"
+            - "--common-system-shutdown-signal-delay={{ .Values.statefulset.commonSystemShutdownSignalDelay }}"
+            - "--reader-node-arguments={{ .Values.statefulset.readerNodeArguments }}"
+            - "--reader-node-blocks-chan-capacity={{ .Values.statefulset.readerNodeBlocksChanCapacity }}"
+            - "--reader-node-data-dir={{ .Values.statefulset.readerNodeDataDir }}"
+            - "--reader-node-debug-firehose-logs={{ .Values.statefulset.readerNodeDebugFirehoseLogs }}"
+            - "--reader-node-grpc-listen-addr={{ .Values.statefulset.readerNodeGrpcListenAddr }}"
+            - "--reader-node-manager-api-addr={{ .Values.statefulset.readerNodeManagerApiAddr }}"
+            - "--reader-node-path={{ .Values.statefulset.readerNodePath }}"
+            - "--reader-node-readiness-max-latency={{ .Values.statefulset.readerNodeReadinessMaxLatency }}"
+            - "--reader-node-start-block-num={{ .Values.statefulset.readerNodeStartBlockNum }}"
+            - "--reader-node-stop-block-num={{ .Values.statefulset.readerNodeStopBlockNum }}"
+            - "--reader-node-working-dir={{ .Values.statefulset.readerNodeWorkingDir }}"
+            - "--common-auto-mem-limit-percent={{ .Values.statefulset.commonAutoMemLimitPercent }}"
+            {{- with .Values.statefulset.extraCommands }}
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
           {{- with .Values.statefulset.env }}
           env:
             {{- toYaml . | nindent 12 }}