renamed minio_credentials_secret_name to minio_loki_credentials_secre…

…t_name (#244) * updated references to minio_loki_credentials_secret_name * updated value of minio_loki_credentials_secret_name
mojaloop · Apr 26, 2024 · ead675f · ead675f
1 parent 2c276f3
commit ead675f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/terraform/gitops/generate-files/templates/monitoring/install/values-loki.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/install/values-loki.yaml.tpl
@@ -33,15 +33,15 @@ ingester:
     size: ${loki_ingester_pvc_size}
     storageClass: ${storage_class_name}
   extraArgs: ["-config.expand-env"]
-  extraEnvVarsSecret: ${minio_credentials_secret_name}
+  extraEnvVarsSecret: ${minio_loki_credentials_secret_name}
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING
     values: ["enabled"] 
 compactor:
   # https://grafana.com/docs/loki/latest/operations/storage/boltdb-shipper/#compactor
   extraArgs: ["-config.expand-env"]
-  extraEnvVarsSecret: minio-credentials-secret
+  extraEnvVarsSecret: ${minio_loki_credentials_secret_name}
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING
@@ -58,7 +58,7 @@ gateway:
     values: ["enabled"]
 querier:
   extraArgs: ["-config.expand-env"]
-  extraEnvVarsSecret: minio-credentials-secret
+  extraEnvVarsSecret: ${minio_loki_credentials_secret_name}
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING

diff --git a/terraform/gitops/generate-files/templates/monitoring/install/vault-minio-ext-secret.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/install/vault-minio-ext-secret.yaml.tpl
@@ -1,7 +1,7 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: ${minio_credentials_secret_name}
+  name: ${minio_loki_credentials_secret_name}
   annotations:
     argocd.argoproj.io/sync-wave: "${external_secret_sync_wave}"
 spec:
@@ -12,7 +12,7 @@ spec:
     name: tenant-vault-secret-store
 
   target:
-    name: ${minio_credentials_secret_name} # Name for the secret to be created on the cluster
+    name: ${minio_loki_credentials_secret_name} # Name for the secret to be created on the cluster
     creationPolicy: Owner
 
   data:

diff --git a/terraform/gitops/k8s-cluster-config/monitoring.tf b/terraform/gitops/k8s-cluster-config/monitoring.tf
@@ -36,7 +36,7 @@ module "generate_monitoring_files" {
     loki_ingester_retention_period       = try(var.common_var_map.loki_ingester_retention_period, local.loki_ingester_retention_period)
     prometheus_retention_period          = try(var.common_var_map.prometheus_retention_period, local.prometheus_retention_period)
     alertmanager_enabled                 = try(var.common_var_map.alertmanager_enabled, false)
-    minio_credentials_secret_name        = "minio-credentials-secret"
+    minio_loki_credentials_secret_name   = "minio-loki-credentials-secret"
     minio_api_url                        = var.minio_api_url
     minio_loki_bucket                    = local.minio_loki_bucket
     minio_loki_user_key                  = "${var.cluster_name}/minio_loki_username"