grafana simplification

junior · junior · commit 8e0c6a307124 · 2022-09-09T12:04:35.000-05:00
Signed-off-by: junior &lt;junior@users.noreply.github.com&gt;
diff --git a/module-cluster-tools.tf b/module-cluster-tools.tf
@@ -80,6 +80,6 @@ variable "grafana_enabled" {
 
 # Cluster Tools Outputs
 output "grafana_admin_password" {
-  value = module.cluster-tools.grafana_admin_password
+  value     = module.cluster-tools.grafana_admin_password
   sensitive = true
 }
diff --git a/modules/cluster-tools/grafana.tf b/modules/cluster-tools/grafana.tf
@@ -155,13 +155,13 @@ data "kubernetes_secret" "grafana" {
     name      = "grafana"
     namespace = kubernetes_namespace.cluster_tools.id
   }
-  depends_on = [helm_release.grafana, helm_release.mushop]
+  depends_on = [helm_release.grafana]
 
   count = var.grafana_enabled ? 1 : 0
 }
 
 locals {
-  grafana_admin_password  = var.grafana_enabled ? data.kubernetes_secret.mushop_utils_grafana.0.data.admin-password : "Grafana_Not_Deployed"
+  grafana_admin_password = var.grafana_enabled ? data.kubernetes_secret.grafana.0.data.admin-password : "Grafana_Not_Deployed"
 }
 
 output "grafana_admin_password" {

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,6 @@ variable "grafana_enabled" {`
`80`	`80`
`81`	`81`	`# Cluster Tools Outputs`
`82`	`82`	`output "grafana_admin_password" {`
`83`		`- value = module.cluster-tools.grafana_admin_password`
	`83`	`+ value = module.cluster-tools.grafana_admin_password`
`84`	`84`	`sensitive = true`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,13 +155,13 @@ data "kubernetes_secret" "grafana" {`
`155`	`155`	`name = "grafana"`
`156`	`156`	`namespace = kubernetes_namespace.cluster_tools.id`
`157`	`157`	`}`
`158`		`- depends_on = [helm_release.grafana, helm_release.mushop]`
	`158`	`+ depends_on = [helm_release.grafana]`
`159`	`159`
`160`	`160`	`count = var.grafana_enabled ? 1 : 0`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`locals {`
`164`		`- grafana_admin_password = var.grafana_enabled ? data.kubernetes_secret.mushop_utils_grafana.0.data.admin-password : "Grafana_Not_Deployed"`
	`164`	`+ grafana_admin_password = var.grafana_enabled ? data.kubernetes_secret.grafana.0.data.admin-password : "Grafana_Not_Deployed"`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`output "grafana_admin_password" {`