diff --git a/main.tf b/main.tf index cf8ffb1..cb8aecf 100644 --- a/main.tf +++ b/main.tf @@ -31,23 +31,7 @@ resource "helm_release" "this" { timeout = lookup(var.app, "timeout", 300) values = var.values - dynamic "set" { - iterator = item - for_each = var.set == null ? [] : var.set + set = [for item in coalesce(var.set, []): { "name": item.name, "value": item.value}] + set_sensitive = [for item in coalesce(var.set_sensitive, []): { "name": item.name, "value": item.value}] - content { - name = item.value.name - value = item.value.value - } - } - - dynamic "set_sensitive" { - iterator = item - for_each = var.set_sensitive == null ? [] : var.set_sensitive - - content { - name = item.value.path - value = item.value.value - } - } } diff --git a/outputs.tf b/outputs.tf index 9b9ca4c..7c7489f 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,4 +1,4 @@ output "deployment" { - value = var.app["deploy"] ? helm_release.this[0].metadata : [] + value = var.app["deploy"] ? [ helm_release.this[0].metadata ] : [] description = "The state of the helm deployment" } diff --git a/versions.tf b/versions.tf index cc2fa11..311f25b 100644 --- a/versions.tf +++ b/versions.tf @@ -2,6 +2,6 @@ terraform { required_version = ">= 0.13" required_providers { - helm = ">= 2.0" + helm = ">= 3.0" } }