cleaned up

terraform/monitoring.tf

@@ -4,7 +4,7 @@ resource "helm_release" "kube-prometheus-stack" {
   namespace        = "monitoring"
   chart            = "kube-prometheus-stack"
   create_namespace = true
-#   version          = "4.9.1"
+  #   version          = "4.9.1"
   values = [
     file("${path.module}/values/grafana.values.yaml")
   ]

terraform/networking.tf

@@ -7,15 +7,16 @@ resource "helm_release" "metallb" {
   version          = "0.14.3"
 }
 
+# todo: move to helm so it can be applied in same run as metallb
 resource "kubernetes_manifest" "metallb_address_pool" {
   manifest = yamldecode(file("./manifests/metallb/ipaddresspool.yaml"))
 }
 
+# todo: move to helm so it can be applied in same run as metallb
 resource "kubernetes_manifest" "metallb-l2_advertisement" {
   manifest = yamldecode(file("./manifests/metallb/l2advertisement.yaml"))
 }
 
-
 resource "helm_release" "nginx" {
   name             = "nginx"
   repository       = "https://kubernetes.github.io/ingress-nginx"
@@ -23,4 +24,4 @@ resource "helm_release" "nginx" {
   chart            = "ingress-nginx"
   create_namespace = true
   version          = "4.9.1"
-}
+}

terraform/terraform.tfstate

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.7.3",
-  "serial": 55,
+  "serial": 57,
   "lineage": "3701efec-cb1e-df79-92fb-763329b9b308",
   "outputs": {},
   "resources": [
@@ -246,8 +246,8 @@
                 "chart": "kube-prometheus-stack",
                 "name": "monitoring",
                 "namespace": "monitoring",
-                "revision": 2,
-                "values": "{\"grafana\":{\"ingress\":{\"annotations\":{\"kubernetes.io/ingress.class\":\"nginx\"},\"enabled\":true,\"hosts\":[\"grafana.robertbatson.com\"]}}}",
+                "revision": 3,
+                "values": "{\"grafana\":{\"ingress\":{\"enabled\":true,\"hosts\":[\"grafana.robertbatson.com\"],\"ingressClassName\":\"nginx\"}}}",
                 "version": "56.8.0"
               }
             ],
@@ -273,7 +273,7 @@
             "status": "deployed",
             "timeout": 300,
             "values": [
-              "grafana:\n  ingress:\n    enabled: true\n    annotations:\n      kubernetes.io/ingress.class: nginx\n    hosts:\n      - grafana.robertbatson.com"
+              "grafana:\n  ingress:\n    enabled: true\n    ingressClassName: nginx\n    hosts:\n      - grafana.robertbatson.com"
             ],
             "verify": false,
             "version": "56.8.0",