Move to telemetry namespace

SCT-Engineering · Feb 26, 2025 · 4df9c8c · 4df9c8c
1 parent 0d54266
commit 4df9c8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/main.tf b/main.tf
@@ -1,37 +1,28 @@
 locals {
-  alertmanager_internal_hostname    = format("prometheus-alertmanager.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name)
+  alertmanager_internal_hostname    = format("prometheus-alertmanager.%v.svc.cluster.local", var.namespace)
   alertmanager_internal_port_number = 9093
   alertmanager_internal_url         = format("http://%v:%v/", local.alertmanager_internal_hostname, local.alertmanager_internal_port_number)
 
-  headless_alertmanager_internal_hostname    = format("prometheus-alertmanager-headless.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name)
+  headless_alertmanager_internal_hostname    = format("prometheus-alertmanager-headless.%v.svc.cluster.local", var.namespace)
   headless_alertmanager_internal_port_number = 9093
   headless_alertmanager_internal_url         = format("http://%v:%v/", local.alertmanager_internal_hostname, local.alertmanager_internal_port_number)
 
-  pushgateway_internal_hostname    = format("prometheus-prometheus-pushgateway.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name)
+  pushgateway_internal_hostname    = format("prometheus-prometheus-pushgateway.%v.svc.cluster.local", var.namespace)
   pushgateway_internal_port_number = 9091
   pushgateway_internal_url         = format("http://%v:%v/", local.pushgateway_internal_hostname, local.pushgateway_internal_port_number)
 
-  server_internal_hostname    = format("prometheus-server.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name)
+  server_internal_hostname    = format("prometheus-server.%v.svc.cluster.local", var.namespace)
   server_internal_port_number = 9090
   server_internal_url         = format("http://%v:%v/", local.server_internal_hostname, local.server_internal_port_number)
 }
 
-resource "kubernetes_namespace" "ns" {
-  metadata {
-    name = var.namespace
-    labels = {
-      istio-injection = "enabled"
-    }
-  }
-}
-
 resource "helm_release" "prometheus" {
   depends_on = [
     module.images,
   ]
   chart      = "prometheus"
   name       = "prometheus"
-  namespace  = kubernetes_namespace.ns.metadata[0].name
+  namespace  = var.namespace
   version    = var.prometheus_chart_version
   repository = "https://prometheus-community.github.io/helm-charts"
 

diff --git a/outputs.tf b/outputs.tf
@@ -36,7 +36,7 @@ output "prometheus_server_internal_endpoint" {
 
 output "prometheus_namespace" {
   description = "namespace for prometheus"
-  value       = kubernetes_namespace.ns.metadata[0].name
+  value       = var.namespace
 }
 
 ################################################################################