Merge pull request #14 from nimbux911/fix_helm_release_ingress_nginx

Fix made on ingress nginx
nimbux911 · Jul 6, 2022 · c7cffed · c7cffed
2 parents 1192efe + 4b1f081
commit c7cffed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.7] - 2022-07-06
+
+### Fixed
+- Add default values for `controller.metrics.enabled` and `controller.metrics.serviceMonitor.enabled` to ingress-nginx Helm release in order to allow deploying it without having Prometheus as a dependency.
+
 ## [3.1.6] - 2022-06-28
 
 ### Added

diff --git a/helm.tf b/helm.tf
@@ -14,20 +14,17 @@ resource "helm_release" "ingress_nginx" {
     file("${path.module}/helm-values/ingress-nginx.yaml")
   ]
 
-
   dynamic "set" {
-    for_each = var.helm_prometheus_enabled != null ? ["do it"] : []
     content {
       name  = "controller.metrics.enabled"
-      value = true
+      value = var.helm_prometheus_enabled
     }
   }
 
   dynamic "set" {
-    for_each = var.helm_prometheus_enabled != null ? ["do it"] : []
     content {
       name  = "controller.metrics.serviceMonitor.enabled"
-      value = true
+      value = var.helm_prometheus_enabled
     }
   }