Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1b6e838
Adding minio tenant helm chart conditionally
deepak-swirlds Aug 3, 2023
482db34
finally upload to minio works !
deepak-swirlds Aug 4, 2023
11cd981
upload folder name fixed
deepak-swirlds Aug 8, 2023
c9cdfa2
Merge commit main
deepak-swirlds Aug 8, 2023
158c196
Merge branch 'main' into 177-mirror-uploader-streams-to-minio
leninmehedy Aug 8, 2023
988324b
fix: setup cloud configs and chart dependency condition
leninmehedy Aug 9, 2023
f3a8d8c
hardcode s3 enabled, gcs disabled
deepak-swirlds Aug 9, 2023
f7e0ef6
Adding support to make file for deploying minio operator
deepak-swirlds Aug 9, 2023
de2b28e
Merge branch '177-mirror-uploader-streams-to-minio' of https://github…
deepak-swirlds Aug 9, 2023
72c997f
deploy minio operator if required
deepak-swirlds Aug 9, 2023
6187df0
do helm depepdency update
deepak-swirlds Aug 9, 2023
080bbe5
Merge remote-tracking branch 'origin/main' into 177-mirror-uploader-s…
deepak-swirlds Aug 9, 2023
3afaf28
[make test] was missing [deploy-minio-operator-if-required update-hel…
deepak-swirlds Aug 9, 2023
265607e
Delete Chart.lock
deepak-swirlds Aug 9, 2023
0bb7fa5
adding mirror node
deepak-swirlds Aug 11, 2023
591aa6f
Merge branch '177-mirror-uploader-streams-to-minio' into 208-add-mirr…
deepak-swirlds Aug 11, 2023
faa5dac
adding configuration for hedera mirror node
deepak-swirlds Aug 14, 2023
4bf1221
Merge branch 'main' into 177-mirror-uploader-streams-to-minio
deepak-swirlds Aug 14, 2023
02f3f46
Merge branch 'main' into 208-add-mirror-node-as-a-conditional-subchart
deepak-swirlds Aug 14, 2023
7d7f207
Merge branch 'main' into 177-mirror-uploader-streams-to-minio
deepak-swirlds Aug 16, 2023
e030ca4
removed extra bucket name at end of the minio url
deepak-swirlds Aug 18, 2023
c54bc79
Merge remote-tracking branch 'origin/main' into 208-add-mirror-node-a…
deepak-swirlds Aug 18, 2023
22416e9
Merge branch '208-add-mirror-node-as-a-conditional-subchart' of https…
deepak-swirlds Aug 18, 2023
e0cfb0b
adding the conditional chart check
deepak-swirlds Aug 18, 2023
abec01d
accidentally added hedera mirror explorer helm chart, removing it
deepak-swirlds Aug 18, 2023
e2936ef
using helm generated accessKey and secretKey for minio & using templa…
deepak-swirlds Aug 21, 2023
f12a063
Merge branch '177-mirror-uploader-streams-to-minio' into 208-add-mirr…
deepak-swirlds Aug 21, 2023
a9f568a
disabling subchart tests
deepak-swirlds Aug 21, 2023
0c9f7d9
disable logs in helm test
deepak-swirlds Aug 21, 2023
9c21152
adding get logs after helm test
deepak-swirlds Aug 21, 2023
636e0cd
fixed an error in Makefileile
deepak-swirlds Aug 21, 2023
4de208e
fix: resolves typo in values file
nathanklick Aug 21, 2023
8ec92fd
Merge remote-tracking branch 'origin/177-mirror-uploader-streams-to-m…
deepak-swirlds Aug 21, 2023
4d02566
Merge remote-tracking branch 'origin/main' into 208-add-mirror-node-a…
deepak-swirlds Aug 22, 2023
a7cb457
undo merge mistake in Makefile
deepak-swirlds Aug 22, 2023
9567b71
using helm autogenerated secrets in minio
deepak-swirlds Aug 22, 2023
8ecb0eb
fixed a merge mistake in values.yaml (too many mistakes !)
deepak-swirlds Aug 22, 2023
b8570b6
Delete Chart.lock
deepak-swirlds Aug 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions charts/hedera-network/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }}
---
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions charts/hedera-network/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ cloud:
buckets:
streamBucket: "fst-streams"
backupBucket: "fst-backups"
s3:
enable: "true"
gcs:
enable: "true"

# telemetry configurations
telemetry:
Expand Down Expand Up @@ -177,6 +181,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:
Expand Down
8 changes: 7 additions & 1 deletion dev/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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
Expand Down