diff --git a/examples/advanced/main.tf b/examples/advanced/main.tf
index e2302c6f..1e40e306 100644
--- a/examples/advanced/main.tf
+++ b/examples/advanced/main.tf
@@ -245,7 +245,7 @@ module "trusted_profile" {
module "logs_agents" {
depends_on = [module.kube_audit]
source = "terraform-ibm-modules/logs-agent/ibm"
- version = "1.2.2"
+ version = "1.7.0"
cluster_id = module.ocp_base.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
logs_agent_trusted_profile_id = module.trusted_profile.trusted_profile.id
diff --git a/examples/advanced/provider.tf b/examples/advanced/provider.tf
index 5ea1365e..bb346be9 100644
--- a/examples/advanced/provider.tf
+++ b/examples/advanced/provider.tf
@@ -14,15 +14,15 @@ provider "kubernetes" {
}
provider "helm" {
- kubernetes {
+ kubernetes = {
host = data.ibm_container_cluster_config.cluster_config.host
token = data.ibm_container_cluster_config.cluster_config.token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config.ca_certificate
}
# IBM Cloud credentials are required to authenticate to the helm repo
- registry {
+ registries = [{
url = "oci://icr.io/ibm/observe/logs-agent-helm"
username = "iamapikey"
password = var.ibmcloud_api_key
- }
+ }]
}
diff --git a/examples/advanced/version.tf b/examples/advanced/version.tf
index 7fe51c0b..25c40b99 100644
--- a/examples/advanced/version.tf
+++ b/examples/advanced/version.tf
@@ -14,7 +14,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
- version = ">= 2.15.0"
+ version = ">= 3.0.0, <4.0.0"
}
}
}
diff --git a/examples/multiple_mzr_clusters/main.tf b/examples/multiple_mzr_clusters/main.tf
index 0e437987..155b2ebc 100644
--- a/examples/multiple_mzr_clusters/main.tf
+++ b/examples/multiple_mzr_clusters/main.tf
@@ -190,7 +190,7 @@ module "monitoring_agent_1" {
helm = helm.helm_cluster_1
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
- version = "1.6.3"
+ version = "1.7.4"
cluster_id = module.ocp_base_cluster_1.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
access_key = module.monitoring_instance.access_key
@@ -202,7 +202,7 @@ module "monitoring_agent_2" {
helm = helm.helm_cluster_2
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
- version = "1.6.3"
+ version = "1.7.4"
cluster_id = module.ocp_base_cluster_2.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
access_key = module.monitoring_instance.access_key
diff --git a/examples/multiple_mzr_clusters/provider.tf b/examples/multiple_mzr_clusters/provider.tf
index 369da6e1..dfdd876c 100644
--- a/examples/multiple_mzr_clusters/provider.tf
+++ b/examples/multiple_mzr_clusters/provider.tf
@@ -9,7 +9,7 @@ provider "ibm" {
provider "helm" {
alias = "helm_cluster_1"
- kubernetes {
+ kubernetes = {
host = data.ibm_container_cluster_config.cluster_config_c1.host
token = data.ibm_container_cluster_config.cluster_config_c1.token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c1.ca_certificate
@@ -18,7 +18,7 @@ provider "helm" {
provider "helm" {
alias = "helm_cluster_2"
- kubernetes {
+ kubernetes = {
host = data.ibm_container_cluster_config.cluster_config_c2.host
token = data.ibm_container_cluster_config.cluster_config_c2.token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c2.ca_certificate
diff --git a/examples/multiple_mzr_clusters/version.tf b/examples/multiple_mzr_clusters/version.tf
index 26ecd47f..f47049f1 100644
--- a/examples/multiple_mzr_clusters/version.tf
+++ b/examples/multiple_mzr_clusters/version.tf
@@ -14,7 +14,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
- version = ">= 2.8.0"
+ version = ">= 3.0.0, <4.0.0"
}
}
}
diff --git a/modules/kube-audit/README.md b/modules/kube-audit/README.md
index 0cc061f3..aa48993f 100644
--- a/modules/kube-audit/README.md
+++ b/modules/kube-audit/README.md
@@ -56,7 +56,7 @@ module "kube_audit" {
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >=1.9.0 |
-| [helm](#requirement\_helm) | >= 2.15.0, <3.0.0 |
+| [helm](#requirement\_helm) | >= 3.0.0, <4.0.0 |
| [ibm](#requirement\_ibm) | >= 1.78.2, <2.0.0 |
| [null](#requirement\_null) | >= 3.2.1, < 4.0.0 |
| [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |
diff --git a/modules/kube-audit/main.tf b/modules/kube-audit/main.tf
index ae0d7757..a26587a3 100644
--- a/modules/kube-audit/main.tf
+++ b/modules/kube-audit/main.tf
@@ -48,28 +48,28 @@ resource "helm_release" "kube_audit" {
recreate_pods = true
force_update = true
- set {
- name = "metadata.name"
- type = "string"
- value = var.audit_deployment_name
- }
-
- set {
- name = "metadata.namespace"
- type = "string"
- value = var.audit_namespace
- }
- set {
- name = "image.name"
- type = "string"
- value = var.audit_webhook_listener_image
- }
-
- set {
- name = "image.tag"
- type = "string"
- value = var.audit_webhook_listener_image_tag_digest
- }
+ set = [
+ {
+ name = "metadata.name"
+ type = "string"
+ value = var.audit_deployment_name
+ },
+ {
+ name = "metadata.namespace"
+ type = "string"
+ value = var.audit_namespace
+ },
+ {
+ name = "image.name"
+ type = "string"
+ value = var.audit_webhook_listener_image
+ },
+ {
+ name = "image.tag"
+ type = "string"
+ value = var.audit_webhook_listener_image_tag_digest
+ }
+ ]
provisioner "local-exec" {
command = "${path.module}/scripts/confirm-rollout-status.sh ${var.audit_deployment_name} ${var.audit_namespace}"
diff --git a/modules/kube-audit/version.tf b/modules/kube-audit/version.tf
index cf7c55f1..620e0df7 100644
--- a/modules/kube-audit/version.tf
+++ b/modules/kube-audit/version.tf
@@ -18,7 +18,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
- version = ">= 2.15.0, <3.0.0"
+ version = ">= 3.0.0, <4.0.0"
}
}
}
diff --git a/solutions/fully-configurable/provider.tf b/solutions/fully-configurable/provider.tf
index 3ff173c3..3cd334a0 100644
--- a/solutions/fully-configurable/provider.tf
+++ b/solutions/fully-configurable/provider.tf
@@ -26,7 +26,7 @@ provider "ibm" {
}
provider "helm" {
- kubernetes {
+ kubernetes = {
host = data.ibm_container_cluster_config.cluster_config[0].host
token = data.ibm_container_cluster_config.cluster_config[0].token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config[0].ca_certificate
diff --git a/solutions/fully-configurable/version.tf b/solutions/fully-configurable/version.tf
index 6ba3e371..dd204af3 100644
--- a/solutions/fully-configurable/version.tf
+++ b/solutions/fully-configurable/version.tf
@@ -9,7 +9,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
- version = "2.17.0"
+ version = "3.0.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
diff --git a/tests/pr_test.go b/tests/pr_test.go
index 550156d4..486c81b2 100644
--- a/tests/pr_test.go
+++ b/tests/pr_test.go
@@ -179,6 +179,8 @@ func TestRunUpgradeFullyConfigurable(t *testing.T) {
DeleteWorkspaceOnFail: false,
})
+ options.IgnoreUpdates = testhelper.Exemptions{List: []string{"module.kube_audit[0].helm_release.kube_audit"}}
+
options.TerraformVars = []testschematic.TestSchematicTerraformVar{
{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
{Name: "prefix", Value: options.Prefix, DataType: "string"},