Skip to content

Commit ab7ed6f

Browse files
authored
feat(deps): updated required helm provider version to >= 3.0.0, <4.0.0 (#787)
1 parent a97bc84 commit ab7ed6f

File tree

12 files changed

+38
-36
lines changed

12 files changed

+38
-36
lines changed

examples/advanced/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ module "trusted_profile" {
245245
module "logs_agents" {
246246
depends_on = [module.kube_audit]
247247
source = "terraform-ibm-modules/logs-agent/ibm"
248-
version = "1.2.2"
248+
version = "1.7.0"
249249
cluster_id = module.ocp_base.cluster_id
250250
cluster_resource_group_id = module.resource_group.resource_group_id
251251
logs_agent_trusted_profile_id = module.trusted_profile.trusted_profile.id

examples/advanced/provider.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ provider "kubernetes" {
1414
}
1515

1616
provider "helm" {
17-
kubernetes {
17+
kubernetes = {
1818
host = data.ibm_container_cluster_config.cluster_config.host
1919
token = data.ibm_container_cluster_config.cluster_config.token
2020
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config.ca_certificate
2121
}
2222
# IBM Cloud credentials are required to authenticate to the helm repo
23-
registry {
23+
registries = [{
2424
url = "oci://icr.io/ibm/observe/logs-agent-helm"
2525
username = "iamapikey"
2626
password = var.ibmcloud_api_key
27-
}
27+
}]
2828
}

examples/advanced/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ terraform {
1414
}
1515
helm = {
1616
source = "hashicorp/helm"
17-
version = ">= 2.15.0"
17+
version = ">= 3.0.0, <4.0.0"
1818
}
1919
}
2020
}

examples/multiple_mzr_clusters/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ module "monitoring_agent_1" {
190190
helm = helm.helm_cluster_1
191191
}
192192
source = "terraform-ibm-modules/monitoring-agent/ibm"
193-
version = "1.6.3"
193+
version = "1.7.4"
194194
cluster_id = module.ocp_base_cluster_1.cluster_id
195195
cluster_resource_group_id = module.resource_group.resource_group_id
196196
access_key = module.monitoring_instance.access_key
@@ -202,7 +202,7 @@ module "monitoring_agent_2" {
202202
helm = helm.helm_cluster_2
203203
}
204204
source = "terraform-ibm-modules/monitoring-agent/ibm"
205-
version = "1.6.3"
205+
version = "1.7.4"
206206
cluster_id = module.ocp_base_cluster_2.cluster_id
207207
cluster_resource_group_id = module.resource_group.resource_group_id
208208
access_key = module.monitoring_instance.access_key

examples/multiple_mzr_clusters/provider.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ provider "ibm" {
99

1010
provider "helm" {
1111
alias = "helm_cluster_1"
12-
kubernetes {
12+
kubernetes = {
1313
host = data.ibm_container_cluster_config.cluster_config_c1.host
1414
token = data.ibm_container_cluster_config.cluster_config_c1.token
1515
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c1.ca_certificate
@@ -18,7 +18,7 @@ provider "helm" {
1818

1919
provider "helm" {
2020
alias = "helm_cluster_2"
21-
kubernetes {
21+
kubernetes = {
2222
host = data.ibm_container_cluster_config.cluster_config_c2.host
2323
token = data.ibm_container_cluster_config.cluster_config_c2.token
2424
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c2.ca_certificate

examples/multiple_mzr_clusters/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ terraform {
1414
}
1515
helm = {
1616
source = "hashicorp/helm"
17-
version = ">= 2.8.0"
17+
version = ">= 3.0.0, <4.0.0"
1818
}
1919
}
2020
}

modules/kube-audit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module "kube_audit" {
5656
| Name | Version |
5757
|------|---------|
5858
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.9.0 |
59-
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.15.0, <3.0.0 |
59+
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0.0, <4.0.0 |
6060
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.78.2, <2.0.0 |
6161
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1, < 4.0.0 |
6262
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |

modules/kube-audit/main.tf

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,28 @@ resource "helm_release" "kube_audit" {
4848
recreate_pods = true
4949
force_update = true
5050

51-
set {
52-
name = "metadata.name"
53-
type = "string"
54-
value = var.audit_deployment_name
55-
}
56-
57-
set {
58-
name = "metadata.namespace"
59-
type = "string"
60-
value = var.audit_namespace
61-
}
62-
set {
63-
name = "image.name"
64-
type = "string"
65-
value = var.audit_webhook_listener_image
66-
}
67-
68-
set {
69-
name = "image.tag"
70-
type = "string"
71-
value = var.audit_webhook_listener_image_tag_digest
72-
}
51+
set = [
52+
{
53+
name = "metadata.name"
54+
type = "string"
55+
value = var.audit_deployment_name
56+
},
57+
{
58+
name = "metadata.namespace"
59+
type = "string"
60+
value = var.audit_namespace
61+
},
62+
{
63+
name = "image.name"
64+
type = "string"
65+
value = var.audit_webhook_listener_image
66+
},
67+
{
68+
name = "image.tag"
69+
type = "string"
70+
value = var.audit_webhook_listener_image_tag_digest
71+
}
72+
]
7373

7474
provisioner "local-exec" {
7575
command = "${path.module}/scripts/confirm-rollout-status.sh ${var.audit_deployment_name} ${var.audit_namespace}"

modules/kube-audit/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ terraform {
1818
}
1919
helm = {
2020
source = "hashicorp/helm"
21-
version = ">= 2.15.0, <3.0.0"
21+
version = ">= 3.0.0, <4.0.0"
2222
}
2323
}
2424
}

solutions/fully-configurable/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ provider "ibm" {
2626
}
2727

2828
provider "helm" {
29-
kubernetes {
29+
kubernetes = {
3030
host = data.ibm_container_cluster_config.cluster_config[0].host
3131
token = data.ibm_container_cluster_config.cluster_config[0].token
3232
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config[0].ca_certificate

0 commit comments

Comments
 (0)