diff --git a/README.md b/README.md index e60e762c..6acdbe96 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ module "eks" { |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 5.0 | -| [helm](#requirement\_helm) | >= 2.9, < 3.0 | +| [helm](#requirement\_helm) | >= 3.0 | | [kubernetes](#requirement\_kubernetes) | >= 2.20 | | [random](#requirement\_random) | >= 3.6 | | [time](#requirement\_time) | >= 0.9 | @@ -79,7 +79,7 @@ module "eks" { | Name | Version | |------|---------| | [aws](#provider\_aws) | >= 5.0 | -| [helm](#provider\_helm) | >= 2.9, < 3.0 | +| [helm](#provider\_helm) | >= 3.0 | | [kubernetes](#provider\_kubernetes) | >= 2.20 | | [random](#provider\_random) | >= 3.6 | | [time](#provider\_time) | >= 0.9 | diff --git a/helm.tf b/helm.tf index 8e135c15..d739372d 100644 --- a/helm.tf +++ b/helm.tf @@ -39,35 +39,9 @@ resource "helm_release" "this" { dependency_update = try(each.value.dependency_update, null) replace = try(each.value.replace, null) lint = try(each.value.lint, null) - - dynamic "postrender" { - for_each = try([each.value.postrender], []) - - content { - binary_path = postrender.value.binary_path - args = try(postrender.value.args, null) - } - } - - dynamic "set" { - for_each = try(each.value.set, []) - - content { - name = set.value.name - value = set.value.value - type = try(set.value.type, null) - } - } - - dynamic "set_sensitive" { - for_each = try(each.value.set_sensitive, []) - - content { - name = set_sensitive.value.name - value = set_sensitive.value.value - type = try(set_sensitive.value.type, null) - } - } + postrender = try(each.value.postrender, []) + set = try(each.value.set, []) + set_sensitive = try(each.value.set_sensitive, []) depends_on = [ # Wait for EBS CSI, etc. to be installed first diff --git a/tests/complete/README.md b/tests/complete/README.md index fa8fe65c..cbae1874 100644 --- a/tests/complete/README.md +++ b/tests/complete/README.md @@ -34,7 +34,7 @@ terraform destroy |------|---------| | [terraform](#requirement\_terraform) | >= 1.3.2 | | [aws](#requirement\_aws) | >= 5.70 | -| [helm](#requirement\_helm) | >= 2.9, < 3.0 | +| [helm](#requirement\_helm) | >= 3.0 | | [kubernetes](#requirement\_kubernetes) | >= 2.20 | ## Providers diff --git a/tests/complete/main.tf b/tests/complete/main.tf index 8da0ce05..0ea39a90 100644 --- a/tests/complete/main.tf +++ b/tests/complete/main.tf @@ -21,11 +21,11 @@ provider "kubernetes" { } provider "helm" { - kubernetes { + kubernetes = { host = module.eks.cluster_endpoint cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data) - exec { + exec = { api_version = "client.authentication.k8s.io/v1beta1" command = "aws" # This requires the awscli to be installed locally where Terraform is executed diff --git a/tests/complete/versions.tf b/tests/complete/versions.tf index 9bfa9eab..d48b57c5 100644 --- a/tests/complete/versions.tf +++ b/tests/complete/versions.tf @@ -8,7 +8,7 @@ terraform { } helm = { source = "hashicorp/helm" - version = ">= 2.9, < 3.0" + version = ">= 3.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/versions.tf b/versions.tf index c5cc72d9..22f223d2 100644 --- a/versions.tf +++ b/versions.tf @@ -8,7 +8,7 @@ terraform { } helm = { source = "hashicorp/helm" - version = ">= 2.9, < 3.0" + version = ">= 3.0" } kubernetes = { source = "hashicorp/kubernetes"