Refactor helm datasources (#1020)

Refactor helm datasources for 5.1.8

Author: robo-cap

modules/extensions/autoscaler.tf

@@ -57,46 +57,38 @@ data "helm_template" "cluster_autoscaler" {
     for path in var.cluster_autoscaler_helm_values_files : file(path)
   ] : null
 
-  set {
-    name  = "nodeSelector.oke\\.oraclecloud\\.com/cluster_autoscaler"
-    value = "allowed"
-  }
-
-  dynamic "set" {
-    for_each = merge(local.cluster_autoscaler_defaults, var.cluster_autoscaler_helm_values)
-    iterator = helm_value
-    content {
-      name  = helm_value.key
-      value = helm_value.value
-    }
-  }
-
-  dynamic "set" {
-    for_each = local.worker_pools_autoscaling
-    iterator = pool
-    content {
-      name  = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), pool.key)}].name"
-      value = lookup(pool.value, "id")
-    }
-  }
-
-  dynamic "set" {
-    for_each = local.worker_pools_autoscaling
-    iterator = pool
-    content {
-      name  = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), pool.key)}].minSize"
-      value = lookup(pool.value, "min_size", lookup(pool.value, "size"))
-    }
-  }
-
-  dynamic "set" {
-    for_each = local.worker_pools_autoscaling
-    iterator = pool
-    content {
-      name  = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), pool.key)}].maxSize"
-      value = lookup(pool.value, "max_size", lookup(pool.value, "size"))
-    }
-  }
+  set = concat(
+    [
+      {
+        name  = "nodeSelector.oke\\.oraclecloud\\.com/cluster_autoscaler"
+        value = "allowed"
+      }
+    ],
+    [ for k, v in merge(local.cluster_autoscaler_defaults, var.cluster_autoscaler_helm_values) : 
+      { 
+        name  = k, 
+        value = v 
+      } 
+    ],
+    [ for k, v in local.worker_pools_autoscaling : 
+      { 
+        name  = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), k)}].name", 
+        value = lookup(v, "id")
+      } 
+    ],
+    [ for k, v in local.worker_pools_autoscaling : 
+      { 
+        name  = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), k)}].minSize", 
+        value = lookup(v, "min_size", lookup(v, "size"))
+      }
+    ],
+    [ for k, v in local.worker_pools_autoscaling : 
+      { 
+        name  = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), k)}].maxSize", 
+        value = lookup(v, "max_size", lookup(v, "size"))
+      }
+    ],
+  )
 
   lifecycle {
     precondition {

modules/extensions/dcgm_exporter.tf

@@ -47,14 +47,14 @@ data "helm_template" "dcgm_exporter" {
     for path in var.dcgm_exporter_helm_values_files : file(path)
   ] : null
 
-  dynamic "set" {
-    for_each = var.dcgm_exporter_helm_values
-    iterator = helm_value
-    content {
-      name  = helm_value.key
-      value = helm_value.value
-    }
-  }
+  set = concat(
+    [ for k, v in var.dcgm_exporter_helm_values:
+      {
+        name  = k,
+        value = v
+      }
+    ]
+  )
 
   lifecycle {
     precondition {

modules/extensions/gatekeeper.tf

@@ -23,26 +23,14 @@ data "helm_template" "gatekeeper" {
     for path in var.gatekeeper_helm_values_files : file(path)
   ] : null
 
-  # TODO Remove after merge: https://github.com/open-policy-agent/gatekeeper/pull/2593
-  set {
-    name  = "postInstall.labelNamespace.enabled"
-    value = "false"
-  }
-
-  # TODO Remove after merge: https://github.com/open-policy-agent/gatekeeper/pull/2593
-  set {
-    name  = "postInstall.probeWebhook.enabled"
-    value = "false"
-  }
-
-  dynamic "set" {
-    for_each = var.gatekeeper_helm_values
-    iterator = helm_value
-    content {
-      name  = helm_value.key
-      value = helm_value.value
-    }
-  }
+  set = concat(
+    [ for k, v in var.gatekeeper_helm_values:
+      {
+        name  = k,
+        value = v
+      }
+    ]
+  )
 
   lifecycle {
     precondition {

modules/extensions/metricserver.tf

@@ -23,14 +23,14 @@ data "helm_template" "metrics_server" {
     for path in var.metrics_server_helm_values_files : file(path)
   ] : null
 
-  dynamic "set" {
-    for_each = var.metrics_server_helm_values
-    iterator = helm_value
-    content {
-      name  = helm_value.key
-      value = helm_value.value
-    }
-  }
+  set = concat(
+    [ for k, v in var.metrics_server_helm_values:
+      {
+        name  = k,
+        value = v
+      }
+    ]
+  )
 
   lifecycle {
     precondition {

modules/extensions/prometheus.tf

@@ -32,19 +32,20 @@ data "helm_template" "prometheus" {
     [for path in var.prometheus_helm_values_files : file(path)],
   )
 
-  set {
-    name  = "podSecurityPolicy.enabled"
-    value = "false"
-  }
-
-  dynamic "set" {
-    for_each = var.prometheus_helm_values
-    iterator = helm_value
-    content {
-      name  = helm_value.key
-      value = helm_value.value
-    }
-  }
+  set = concat(
+    [
+      {
+        name  = "podSecurityPolicy.enabled"
+        value = "false"
+      },
+    ],
+    [ for k, v in var.prometheus_helm_values:
+      {
+        name  = k,
+        value = v
+      }
+    ]
+  )
 
   lifecycle {
     precondition {

modules/extensions/versions.tf

@@ -7,7 +7,7 @@ terraform {
   required_providers {
     helm = {
       source  = "hashicorp/helm"
-      version = ">= 2.9.0"
+      version = ">= 3.0.1"
     }
 
     http = {

versions.tf

@@ -12,7 +12,7 @@ terraform {
 
     helm = {
       source  = "hashicorp/helm"
-      version = ">= 2.9.0"
+      version = ">= 3.0.1"
     }
 
     null = {