viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace hardcoded namespace with module reference [ci skip]

Browse source
This commit is contained in:
Viktor Barzin 2025-12-29 10:23:42 +00:00
parent 450bc96db8
commit f1dde96d80
83 changed files with 411 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/kubernetes/monitoring/grafana.tf
View file

@ -43,7 +43,7 @@ resource "kubernetes_persistent_volume" "alertmanager_pv" {
# resource "kubernetes_persistent_volume_claim" "grafana_pvc" {
# metadata {
# name = "grafana-pvc"
# namespace = "monitoring"
# namespace = kubernetes_namespace.monitoring.metadata[0].name
# }
# spec {
# access_modes = ["ReadWriteOnce"]
@ -56,7 +56,7 @@ resource "kubernetes_persistent_volume" "alertmanager_pv" {
# }
resource "helm_release" "grafana" {
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
create_namespace = true
name = "grafana"
atomic = true

8
modules/kubernetes/monitoring/idrac.tf
View file

@ -2,7 +2,7 @@
resource "kubernetes_config_map" "redfish-config" {
metadata {
name = "redfish-exporter-config"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
annotations = {
"reloader.stakater.com/match" = "true"
@ -28,7 +28,7 @@ resource "kubernetes_config_map" "redfish-config" {
resource "kubernetes_deployment" "idrac-redfish" {
metadata {
name = "idrac-redfish-exporter"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
labels = {
app = "idrac-redfish-exporter"
}
@ -78,7 +78,7 @@ resource "kubernetes_deployment" "idrac-redfish" {
resource "kubernetes_service" "idrac-redfish-exporter" {
metadata {
name = "idrac-redfish-exporter"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
labels = {
"app" = "idrac-redfish-exporter"
}
@ -103,7 +103,7 @@ resource "kubernetes_service" "idrac-redfish-exporter" {
module "idrac-redfish-exporter-ingress" {
source = "../ingress_factory"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
name = "idrac-redfish-exporter"
root_domain = "viktorbarzin.lan"
tls_secret_name = var.tls_secret_name

6
modules/kubernetes/monitoring/loki.tf
View file

@ -1,5 +1,5 @@
# resource "helm_release" "loki" {
# namespace = "monitoring"
# namespace = kubernetes_namespace.monitoring.metadata[0].name
# create_namespace = true
# name = "loki"
@ -54,7 +54,7 @@
# https://grafana.com/docs/alloy/latest/configure/kubernetes/
# resource "helm_release" "alloy" {
# namespace = "monitoring"
# namespace = kubernetes_namespace.monitoring.metadata[0].name
# create_namespace = true
# name = "alloy"
@ -71,7 +71,7 @@
# for n in $(kbn | awk '{print $1}'); do echo $n; s wizard@$n 'sudo sysctl -w fs.inotify.max_user_watches=2099999999; sudo sysctl -w fs.inotify.max_user_instances=2099999999;sudo sysctl -w fs.inotify.max_queued_events=2099999999'; done
# resource "helm_release" "k8s-monitoring" {
# namespace = "monitoring"
# namespace = kubernetes_namespace.monitoring.metadata[0].name
# create_namespace = true
# name = "k8s-monitoring"

17
modules/kubernetes/monitoring/main.tf
View file

@ -15,14 +15,23 @@ variable "haos_api_token" { type = string }
variable "pve_password" { type = string }
variable "grafana_db_password" { type = string }
resource "kubernetes_namespace" "monitoring" {
metadata {
name = "monitoring"
labels = {
"istio-injection" : "disabled"
}
}
}
module "tls_secret" {
source = "../setup_tls_secret"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
tls_secret_name = var.tls_secret_name
}
# Terraform get angry with the 30k values file :/ use ansible until solved
# resource "helm_release" "ups_prometheus_snmp_exporter" {
# namespace = "monitoring"
# namespace = kubernetes_namespace.monitoring.metadata[0].name
# create_namespace = true
# name = "ups_prometheus_exporter"
@ -67,7 +76,7 @@ resource "kubernetes_cron_job_v1" "monitor_prom" {
resource "kubernetes_ingress_v1" "status" {
metadata {
name = "hetrix-redirect-ingress"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
annotations = {
"kubernetes.io/ingress.class" = "nginx"
"nginx.ingress.kubernetes.io/permanent-redirect" = "https://hetrixtools.com/r/38981b548b5d38b052aca8d01285a3f3/"
@ -101,7 +110,7 @@ resource "kubernetes_ingress_v1" "status" {
resource "kubernetes_ingress_v1" "status_yotovski" {
metadata {
name = "hetrix-yotovski-redirect-ingress"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
annotations = {
"kubernetes.io/ingress.class" = "nginx"
"nginx.ingress.kubernetes.io/permanent-redirect" = "https://hetrixtools.com/r/2ba9d7a5e017794db0fd91f0115a8b3b/"

4
modules/kubernetes/monitoring/prometheus.tf
View file

@ -2,7 +2,7 @@
resource "kubernetes_persistent_volume_claim" "prometheus_server_pvc" {
metadata {
name = "prometheus-iscsi-pvc"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
}
spec {
@ -45,7 +45,7 @@ resource "kubernetes_persistent_volume" "prometheus_server_pvc" {
}
resource "helm_release" "prometheus" {
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
create_namespace = true
name = "prometheus"

6
modules/kubernetes/monitoring/pve_exporter.tf
View file

@ -2,7 +2,7 @@
resource "kubernetes_secret" "pve_exporter_config" {
metadata {
name = "pve-exporter-config"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
}
data = {
@ -19,7 +19,7 @@ resource "kubernetes_secret" "pve_exporter_config" {
resource "kubernetes_deployment" "pve_exporter" {
metadata {
name = "proxmox-exporter"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
}
spec {
@ -72,7 +72,7 @@ resource "kubernetes_deployment" "pve_exporter" {
resource "kubernetes_service" "proxmox-exporter" {
metadata {
name = "proxmox-exporter"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
labels = {
"app" = "proxmox-exporter"
}

8
modules/kubernetes/monitoring/snmp_exporter.tf
View file

@ -12,7 +12,7 @@ https://sbcode.net/prometheus/snmp-generate-huawei/
resource "kubernetes_config_map" "snmp-exporter-yaml" {
metadata {
name = "snmp-exporter-yaml"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
annotations = {
"reloader.stakater.com/match" = "true"
@ -27,7 +27,7 @@ resource "kubernetes_config_map" "snmp-exporter-yaml" {
resource "kubernetes_deployment" "snmp-exporter" {
metadata {
name = "snmp-exporter"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
labels = {
app = "snmp-exporter"
}
@ -77,7 +77,7 @@ resource "kubernetes_deployment" "snmp-exporter" {
resource "kubernetes_service" "snmp-exporter" {
metadata {
name = "snmp-exporter"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
labels = {
"app" = "snmp-exporter"
}
@ -102,7 +102,7 @@ resource "kubernetes_service" "snmp-exporter" {
module "snmp-exporter-ingress" {
source = "../ingress_factory"
namespace = "monitoring"
namespace = kubernetes_namespace.monitoring.metadata[0].name
name = "snmp-exporter"
root_domain = "viktorbarzin.lan"
tls_secret_name = var.tls_secret_name