Merge branch 'main' into gateway-api

.gitignore

@@ -513,3 +513,4 @@ secring.*
 dev/local-node/config.txt
 dev/temp/.env
 charts/deleteme.yaml
+charts/hedera-network/Chart.lock

charts/hedera-network/Chart.yaml

@@ -26,11 +26,15 @@ appVersion: "0.6.0"
 # This is range of versions of Kubernetes server that is supported by this chart.
 kubeVersion: ">=1.25.0"
 
-# helm dependency update
 dependencies:
+  - name: hedera-mirror
+    alias: hedera-mirror-node
+    version: 0.86.0
+    repository: https://hashgraph.github.io/hedera-mirror-node/charts
+    condition: cloud.minio.enable
+
   - name: tenant
     alias: minio-server
     version: 5.0.7
     repository: https://operator.min.io/
-    # TODO:  is this a good enough name, if we want to group enable/disable the uploader sidecars as a group
     condition: cloud.minio.enable

charts/hedera-network/templates/secrets/uploder-mirror-secrets.yaml

@@ -1,6 +1,7 @@
 {{- $minio_accessKey := randAlpha 10  -}}
 {{- $minio_secretKey := randAlpha 10  -}}
 {{- $minio_config_env := printf "export MINIO_ROOT_USER=%s\nexport MINIO_ROOT_PASSWORD=%s" $minio_accessKey $minio_secretKey -}}
+{{- $minio_url := printf "http://%s-hl:9000" (index $.Values "minio-server" "tenant" "name") -}}
 
 apiVersion: v1
 kind: Secret
@@ -17,4 +18,11 @@ metadata:
 type: Opaque
 data:
   S3_ACCESS_KEY: {{ $minio_accessKey | b64enc }}
-  S3_SECRET_KEY: {{ $minio_secretKey | b64enc }}
+  S3_SECRET_KEY: {{ $minio_secretKey | b64enc }}
+  # The below keys will be ignored by the uploader side cars
+  # These will be used by mirror node to connect to minio
+  HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_TYPE: {{ "S3" | b64enc }}
+  HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_URI: {{ $minio_url |b64enc }}
+  HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_CREDENTIALS_ACCESSKEY: {{ $minio_accessKey | b64enc }}
+  HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_CREDENTIALS_SECRETKEY: {{ $minio_secretKey | b64enc }}
+---

charts/hedera-network/templates/sidecars/_account-balance-uploader.tpl

@@ -47,7 +47,7 @@
     - name: SIG_PRIORITIZE
       value: {{ default $defaults.config.signature.prioritize (($balanceUploader.config).signature).prioritize | quote }}
     - name: BUCKET_PATH
-      value: "accountbalance"
+      value: "accountBalances/balance{{ $nodeId }}"
     - name: BUCKET_NAME
       value: {{ $cloud.buckets.streamBucket | quote }}
     - name: S3_ENABLE

charts/hedera-network/templates/sidecars/_event-stream-uploader.tpl

@@ -48,7 +48,7 @@
     - name: SIG_PRIORITIZE
       value: {{ default $defaults.config.signature.prioritize (($eventStream.config).signature).prioritize | quote }}
     - name: BUCKET_PATH
-      value: "/events"
+      value: "eventsStreams/events_{{ $nodeId }}"
     - name: BUCKET_NAME
       value: {{ $cloud.buckets.streamBucket | quote }}
     - name: S3_ENABLE

charts/hedera-network/templates/sidecars/_record-stream-uploader.tpl

@@ -53,7 +53,7 @@
     - name: SIG_PRIORITIZE
       value: {{ default $defaults.config.signature.prioritize (($recordStream.config).signature).prioritize | quote }}
     - name: BUCKET_PATH
-      value: "recordstreams"
+      value: "recordstreams/record{{ $nodeId }}"
     - name: BUCKET_NAME
       value: {{ $cloud.buckets.streamBucket | quote }}
     - name: S3_ENABLE

charts/hedera-network/values.yaml

@@ -7,6 +7,16 @@ cloud:
   buckets:
     streamBucket: "fst-streams"
     backupBucket: "fst-backups"
+  s3:
+    enable: "true"
+  gcs:
+    enable: "true"
+
+# telemetry configurations
+telemetry:
+  prometheus:
+    svcMonitor:
+      enable: "true"
 
 # telemetry configurations
 telemetry:
@@ -190,6 +200,33 @@ minio-server:
     certificate:
       requestAutoCert: false
 
+hedera-mirror-node:
+  # importer is a component of the hedera mirror node
+  # config for subchart hedera-mirror/importer
+  importer:
+    envFrom:
+      - secretRef:
+          name: mirror-passwords
+      - secretRef:
+          name: "{{ .Release.Name }}-redis"
+      - secretRef:
+          name: uploader-mirror-secrets
+
+    # This is a single node address book, node account id = 0.0.3
+    # The addressbook.bin file updates will be handled by infrastructure code
+    addressBook: CvYGCgwxMC45Ni4xMzEuMzYaBTAuMC4zIswGMzA4MjAxYTIzMDBkMDYwOTJhODY0ODg2ZjcwZDAxMDEwMTA1MDAwMzgyMDE4ZjAwMzA4MjAxOGEwMjgyMDE4MTAwYTEyMDA2ZjI1MjcyNDJjZDdmNTNiOWM0ZmQ1ZGU4NjljNTYyZmY0ZWQ4YTRhYjNhNjI5NjNmM2Y4MTg4YmU3OGYyNThlYWY0MmI5YzNlM2U4ZjU4Njk3MTYwNDEzYmJmNzdhYWRmYWYwZDlmZmQ4Njk4NGIzYmM0ZmI1ZjAyZTExZThhY2I2ZWM2N2U0MjY0YWRkY2ExM2ZmZGU4MzY3NTc4YzI3OTJmYzZhZTMyNmU3YjM0ODU2ZDIzZjAyNTc0ZjVhMjc0ODE1NjAwMzJkNzM3NDlkYWY5ZDMzMmE3ODgzNTEwZTYwZWEyMjI4ODlhM2JmYzNiZWRmMzUwZjNhMzZjYWRhMzliOTQ1MzljNzRmYjgyNjU2NzhiZDVjMTQ4ZmJjOTE2OWFkY2FjZjY3MTliOTJlZThkNDJhOWQyZjg5MjNjYzRmZTNiNDk0YzQ2N2Y0ZTk4YTJhNDllMGEwZWY1YWE0MzNjYmVjNDM4YmFhMjU2YWU2MWEwNTkwY2U0ZTY3ZDBiM2ZlNWYyZGE5YWQ5MGMyNmUyMjlkMjhkNjc5NDU2OTc4ZDY1NzM1NzNlYmI0NjIzOWJhZDRhYmZhYjRmZmU2NGVhNGEzOTdjNmJjNWY3MTc1ZTFhYzM2NDg4ZjE3YzY3NzNiNWVkOTM0MTVlNTdjNDFjNmNkODg2NmRiZDEyMzYwMDYyMzM5Y2IxNTRkODVhZDFhZWNkMWQ3NjBhMDk0MWQ4MGUyOGZlMjQ2MDMzYTg2OGRiYmM4OTc1ZjM2MDQ0MzFmY2U5YWY5MWRjNDI1NDBhYjA0YjFiYmVjMjFmMzVmNzVmMzBhZjZmMDVjODk4NjQyOTM4NmUyYjQzOWJmZDJmZDU5MTJjODI2MDA4MDFlOWMwODU3ZjE2NWU4ODdmMjIzM2RjMmMwOThiYTEyNjdiMDU5ZGI4YTJkYjcxNGZlNTA2NjhkYmYwOTM2MDRhNWRmM2MyMzIxNDY3MjMyMTFjZTU4NTUyNjM4ZmFlOWZjMDY0YTdmMDliMDIwMzAxMDAwMTICGANCCgoECmCDJBC/hwNQAQ==
+    config:
+      # importer is a springboot app, its application.yaml configuration starts here
+      # This config is mounted at [/usr/etc/hedera/application.yaml] in the importer pod
+      hedera:
+        mirror:
+          importer:
+            network: other
+            downloader:
+              allowAnonymousAccess: false
+              bucketName: "fst-streams"
+              # for s3 configuration of mirror node look at uploader-mirror-secrets.yaml
+
 # hedera node configuration
 # Only the name of the node is required. The rest of the configuration will be inherited from `defaults` section
 hedera:

dev/Makefile

@@ -23,6 +23,7 @@ SCRIPTS_DIR=$(PWD)/scripts
 CHART_DIR=$(PWD)/../charts/hedera-network
 SCRIPT_NAME=direct-install.sh
 TMP_DIR=${SCRIPTS_DIR}/../temp
+TELEMETRY_SCRIPT="telemetry.sh"
 
 # scripts
 TELEMETRY_SCRIPT="telemetry.sh"
@@ -59,7 +60,13 @@ helm-test:
 	echo "" && \
 	echo ">> Running helm test..." && \
 	echo "" && \
-	helm test fst --logs
+	# We have to specify the specific test name here, otherwise it executes all tests from the subcharts as well.
+	# I had to remove --logs, because --logs ignores filter and tries to get logs for all test pods
+    #  - Error: unable to get pod logs for fst-graphql-test: pods "fst-graphql-test" not found
+	helm test fst --filter 'name=network-test' && \
+    EXIT_CODE=$$? && \
+	kubectl logs network-test && \
+	exit $${EXIT_CODE}
 
 .PHONY: deploy-network
 deploy-network: deploy-chart