fixed a merge mistake in values.yaml (too many mistakes !)

and used variable for minio_url

Signed-off-by: Deepak Mishra <[email protected]>

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
@@ -21,7 +22,7 @@ data:
   # 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: {{ "http://minio-hl:9000"  | 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/values.yaml

@@ -181,27 +181,6 @@ minio-server:
     certificate:
       requestAutoCert: false
 
-# This configures the minio tenant subchart
-# Reference for configuration: https://github.com/minio/operator/blob/master/helm/tenant/values.yaml
-minio-server:
-  secrets:
-    # This secret has [accessKey, secretKey] and will be randomly generated by helm
-    existingSecret: minio-secrets
-  tenant:
-    buckets:
-      - name: fst-streams
-      - name: fst-backups
-    name: minio
-    pools:
-      - servers: 1
-        name: pool-1
-        volumesPerServer: 1
-        size: 10Gi
-    configuration:
-      name: minio-secrets
-    certificate:
-      requestAutoCert: false
-
 hedera-mirror-node:
   # importer is a component of the hedera mirror node
   # config for subchart hedera-mirror/importer