Skip to content

Commit cb730c0

Browse files
authored
Merge pull request #4 from junior/main
grafana quick fix
2 parents c903e97 + 8e0c6a3 commit cb730c0

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

module-cluster-tools.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,9 @@ variable "grafana_enabled" {
7777
default = false
7878
description = "Enable Grafana Dashboards. Includes example dashboards and Prometheus, OCI Logging and OCI Metrics datasources"
7979
}
80+
81+
# Cluster Tools Outputs
82+
output "grafana_admin_password" {
83+
value = module.cluster-tools.grafana_admin_password
84+
sensitive = true
85+
}

modules/cluster-tools/grafana.tf

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,24 @@ EOF
147147
]
148148

149149
count = var.grafana_enabled ? 1 : 0
150-
}
150+
}
151+
152+
## Kubernetes Secret: Grafana Admin Password
153+
data "kubernetes_secret" "grafana" {
154+
metadata {
155+
name = "grafana"
156+
namespace = kubernetes_namespace.cluster_tools.id
157+
}
158+
depends_on = [helm_release.grafana]
159+
160+
count = var.grafana_enabled ? 1 : 0
161+
}
162+
163+
locals {
164+
grafana_admin_password = var.grafana_enabled ? data.kubernetes_secret.grafana.0.data.admin-password : "Grafana_Not_Deployed"
165+
}
166+
167+
output "grafana_admin_password" {
168+
value = var.grafana_enabled ? local.grafana_admin_password : null
169+
sensitive = true
170+
}

modules/cluster-tools/ingress-nginx.tf

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,15 @@ resource "helm_release" "ingress_nginx" {
7171
}
7272

7373
count = var.ingress_nginx_enabled ? 1 : 0
74-
}
74+
}
75+
76+
## Kubernetes Service: ingress-nginx-controller
77+
data "kubernetes_service" "ingress" {
78+
metadata {
79+
name = "ingress-nginx-controller"
80+
namespace = kubernetes_namespace.cluster_tools.id
81+
}
82+
depends_on = [helm_release.ingress_nginx]
83+
84+
count = var.ingress_nginx_enabled ? 1 : 0
85+
}

0 commit comments

Comments
 (0)