diff --git a/README.md b/README.md index d01c9ce..45a725a 100644 --- a/README.md +++ b/README.md @@ -66,14 +66,14 @@ module "gitops_bridge_bootstrap" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [helm](#requirement\_helm) | >= 2.10.1 | +| [helm](#requirement\_helm) | >= 3.0.0 | | [kubernetes](#requirement\_kubernetes) | >= 2.22.0 | ## Providers | Name | Version | |------|---------| -| [helm](#provider\_helm) | >= 2.10.1 | +| [helm](#provider\_helm) | >= 3.0.0 | | [kubernetes](#provider\_kubernetes) | >= 2.22.0 | ## Modules diff --git a/main.tf b/main.tf index 357abaa..ea2bfea 100644 --- a/main.tf +++ b/main.tf @@ -41,35 +41,9 @@ resource "helm_release" "argocd" { replace = try(var.argocd.replace, null) lint = try(var.argocd.lint, null) - dynamic "postrender" { - for_each = length(try(var.argocd.postrender, {})) > 0 ? [var.argocd.postrender] : [] - - content { - binary_path = postrender.value.binary_path - args = try(postrender.value.args, null) - } - } - - dynamic "set" { - for_each = try(var.argocd.set, []) - - content { - name = set.value.name - value = set.value.value - type = try(set.value.type, null) - } - } - - dynamic "set_sensitive" { - for_each = try(var.argocd.set_sensitive, []) - - content { - name = set_sensitive.value.name - value = set_sensitive.value.value - type = try(set_sensitive.value.type, null) - } - } - + postrender = try(var.argocd.postrender, null) + set = try(var.argocd.set, null) + set_sensitive = try(var.argocd.set_sensitive, null) } diff --git a/tests/complete/main.tf b/tests/complete/main.tf index 24c903f..52fff38 100644 --- a/tests/complete/main.tf +++ b/tests/complete/main.tf @@ -1,12 +1,9 @@ provider "helm" { - kubernetes { + kubernetes = { config_path = "~/.kube/config" } } -provider "kubectl" { - config_path = "~/.kube/config" -} provider "kubernetes" { config_path = "~/.kube/config" } diff --git a/tests/complete/versions.tf b/tests/complete/versions.tf index 7f108cc..7b00804 100644 --- a/tests/complete/versions.tf +++ b/tests/complete/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { helm = { source = "hashicorp/helm" - version = ">= 2.10.1" + version = ">= 3.0.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/versions.tf b/versions.tf index 7f108cc..7b00804 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { helm = { source = "hashicorp/helm" - version = ">= 2.10.1" + version = ">= 3.0.0" } kubernetes = { source = "hashicorp/kubernetes"