From 20b2267d2742c77ada89e606e8489d67d78e3427 Mon Sep 17 00:00:00 2001 From: Terraform IBM Modules Operations Date: Sat, 17 May 2025 07:14:58 +0000 Subject: [PATCH 1/7] fix(deps): update terraform ibm to latest for the landing zone das --- examples/one-vpc-one-vsi/version.tf | 2 +- examples/override-example/version.tf | 2 +- patterns/mixed/versions.tf | 2 +- patterns/roks-quickstart/version.tf | 2 +- patterns/roks/module/versions.tf | 2 +- patterns/roks/versions.tf | 2 +- patterns/vpc/module/version.tf | 2 +- patterns/vpc/version.tf | 2 +- patterns/vsi-extension/version.tf | 2 +- patterns/vsi-quickstart/version.tf | 2 +- patterns/vsi/module/versions.tf | 2 +- patterns/vsi/versions.tf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/one-vpc-one-vsi/version.tf b/examples/one-vpc-one-vsi/version.tf index afa73c92a..09138027f 100644 --- a/examples/one-vpc-one-vsi/version.tf +++ b/examples/one-vpc-one-vsi/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/examples/override-example/version.tf b/examples/override-example/version.tf index afa73c92a..09138027f 100644 --- a/examples/override-example/version.tf +++ b/examples/override-example/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/patterns/mixed/versions.tf b/patterns/mixed/versions.tf index 2c5e7528c..0c0086a22 100644 --- a/patterns/mixed/versions.tf +++ b/patterns/mixed/versions.tf @@ -8,7 +8,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } external = { source = "hashicorp/external" diff --git a/patterns/roks-quickstart/version.tf b/patterns/roks-quickstart/version.tf index 0fa787d80..e3cc1fb65 100644 --- a/patterns/roks-quickstart/version.tf +++ b/patterns/roks-quickstart/version.tf @@ -4,7 +4,7 @@ terraform { # renovate is set up to keep provider version at the latest for all DA solutions ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/patterns/roks/module/versions.tf b/patterns/roks/module/versions.tf index 659ae1710..06f8237b8 100644 --- a/patterns/roks/module/versions.tf +++ b/patterns/roks/module/versions.tf @@ -9,7 +9,7 @@ terraform { # tflint-ignore: terraform_unused_required_providers ibm = { source = "IBM-Cloud/ibm" - version = ">= 1.78.1" + version = ">= 1.78.2" } external = { source = "hashicorp/external" diff --git a/patterns/roks/versions.tf b/patterns/roks/versions.tf index 82c5c9000..ec5f24d18 100644 --- a/patterns/roks/versions.tf +++ b/patterns/roks/versions.tf @@ -8,7 +8,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } # tflint-ignore: terraform_unused_required_providers external = { diff --git a/patterns/vpc/module/version.tf b/patterns/vpc/module/version.tf index 659ae1710..06f8237b8 100644 --- a/patterns/vpc/module/version.tf +++ b/patterns/vpc/module/version.tf @@ -9,7 +9,7 @@ terraform { # tflint-ignore: terraform_unused_required_providers ibm = { source = "IBM-Cloud/ibm" - version = ">= 1.78.1" + version = ">= 1.78.2" } external = { source = "hashicorp/external" diff --git a/patterns/vpc/version.tf b/patterns/vpc/version.tf index 82c5c9000..ec5f24d18 100644 --- a/patterns/vpc/version.tf +++ b/patterns/vpc/version.tf @@ -8,7 +8,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } # tflint-ignore: terraform_unused_required_providers external = { diff --git a/patterns/vsi-extension/version.tf b/patterns/vsi-extension/version.tf index 82c5c9000..ec5f24d18 100644 --- a/patterns/vsi-extension/version.tf +++ b/patterns/vsi-extension/version.tf @@ -8,7 +8,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } # tflint-ignore: terraform_unused_required_providers external = { diff --git a/patterns/vsi-quickstart/version.tf b/patterns/vsi-quickstart/version.tf index 0fa787d80..e3cc1fb65 100644 --- a/patterns/vsi-quickstart/version.tf +++ b/patterns/vsi-quickstart/version.tf @@ -4,7 +4,7 @@ terraform { # renovate is set up to keep provider version at the latest for all DA solutions ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/patterns/vsi/module/versions.tf b/patterns/vsi/module/versions.tf index 659ae1710..06f8237b8 100644 --- a/patterns/vsi/module/versions.tf +++ b/patterns/vsi/module/versions.tf @@ -9,7 +9,7 @@ terraform { # tflint-ignore: terraform_unused_required_providers ibm = { source = "IBM-Cloud/ibm" - version = ">= 1.78.1" + version = ">= 1.78.2" } external = { source = "hashicorp/external" diff --git a/patterns/vsi/versions.tf b/patterns/vsi/versions.tf index 82c5c9000..ec5f24d18 100644 --- a/patterns/vsi/versions.tf +++ b/patterns/vsi/versions.tf @@ -8,7 +8,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } # tflint-ignore: terraform_unused_required_providers external = { From ddbd57ec56feac9416a4c6b2ea3ec8f947c4b240 Mon Sep 17 00:00:00 2001 From: Terraform IBM Modules Operations Date: Sun, 18 May 2025 04:43:52 +0000 Subject: [PATCH 2/7] fix(deps): update terraform dependencies --- cluster.tf | 2 +- main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster.tf b/cluster.tf index cacfcc319..7f1346d3d 100644 --- a/cluster.tf +++ b/cluster.tf @@ -244,7 +244,7 @@ module "cluster" { if cluster.kube_type == "openshift" } source = "terraform-ibm-modules/base-ocp-vpc/ibm" - version = "3.46.14" + version = "3.47.2" resource_group_id = local.resource_groups[each.value.resource_group] region = var.region cluster_name = each.value.cluster_name diff --git a/main.tf b/main.tf index 30ae3ef83..e14b82aa9 100644 --- a/main.tf +++ b/main.tf @@ -33,7 +33,7 @@ locals { # Due to existing implicit dependencies we do not think this will be an issue, including auth policies for activity tracker. module "vpc" { source = "terraform-ibm-modules/landing-zone-vpc/ibm" - version = "7.23.5" + version = "7.23.10" for_each = local.vpc_map name = each.value.prefix existing_vpc_id = each.value.existing_vpc_id From 5eb7c511e4cb5c09322a5335d422ec2a739a3b32 Mon Sep 17 00:00:00 2001 From: Terraform IBM Modules Operations Date: Sun, 18 May 2025 12:23:29 +0000 Subject: [PATCH 3/7] fix(deps): update terraform terraform-ibm-modules/landing-zone-vsi/ibm to v5 --- bastion_host.tf | 2 +- f5_vsi.tf | 2 +- patterns/vsi-extension/main.tf | 2 +- virtual_servers.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bastion_host.tf b/bastion_host.tf index 8278c1f5f..1cb5af4b9 100644 --- a/bastion_host.tf +++ b/bastion_host.tf @@ -42,7 +42,7 @@ module "teleport_config" { module "bastion_host" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "4.7.1" + version = "5.1.18" for_each = local.bastion_vsi_map resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group] create_security_group = each.value.security_group == null ? false : true diff --git a/f5_vsi.tf b/f5_vsi.tf index 3796f9629..73fdfc5b1 100644 --- a/f5_vsi.tf +++ b/f5_vsi.tf @@ -117,7 +117,7 @@ locals { module "f5_vsi" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "4.7.1" + version = "5.1.18" for_each = local.f5_vsi_map resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group] create_security_group = each.value.security_group == null ? false : true diff --git a/patterns/vsi-extension/main.tf b/patterns/vsi-extension/main.tf index 9b451bfb9..cc898d380 100644 --- a/patterns/vsi-extension/main.tf +++ b/patterns/vsi-extension/main.tf @@ -45,7 +45,7 @@ locals { module "vsi" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "4.7.1" + version = "5.1.18" resource_group_id = data.ibm_is_vpc.vpc_by_id.resource_group create_security_group = true prefix = "${var.prefix}-vsi" diff --git a/virtual_servers.tf b/virtual_servers.tf index b47873d61..dc69f8012 100644 --- a/virtual_servers.tf +++ b/virtual_servers.tf @@ -41,7 +41,7 @@ data "ibm_is_image" "image" { module "vsi" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "4.7.1" + version = "5.1.18" for_each = local.vsi_map resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group] create_security_group = each.value.security_group == null ? false : true From bcfbbbb0eb8885351535b2f5af9d9c7a56381054 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Mon, 19 May 2025 22:10:50 +0530 Subject: [PATCH 4/7] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3e4c9df11..b0a234f9c 100644 --- a/README.md +++ b/README.md @@ -852,7 +852,7 @@ module "cluster_pattern" { | Name | Source | Version | |------|--------|---------| | [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.7.1 | -| [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.46.14 | +| [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.47.2 | | [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a | | [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.7.1 | | [key\_management](#module\_key\_management) | ./kms | n/a | @@ -860,7 +860,7 @@ module "cluster_pattern" { | [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a | | [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a | | [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.31.0 | -| [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.23.5 | +| [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.23.10 | | [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.7.1 | ### Resources From dd5682ef0cfd5821cb23f68d3d203e8466d6afbd Mon Sep 17 00:00:00 2001 From: Todd Giguere Date: Tue, 20 May 2025 08:34:23 -0400 Subject: [PATCH 5/7] fix: remove unsupported inputs for vsi module major version change --- README.md | 6 +++--- patterns/vsi-extension/main.tf | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b0a234f9c..7eed8d1df 100644 --- a/README.md +++ b/README.md @@ -851,17 +851,17 @@ module "cluster_pattern" { | Name | Source | Version | |------|--------|---------| -| [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.7.1 | +| [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.18 | | [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.47.2 | | [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a | -| [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.7.1 | +| [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.18 | | [key\_management](#module\_key\_management) | ./kms | n/a | | [placement\_group\_map](#module\_placement\_group\_map) | ./dynamic_values/config_modules/list_to_map | n/a | | [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a | | [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a | | [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.31.0 | | [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.23.10 | -| [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.7.1 | +| [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.18 | ### Resources diff --git a/patterns/vsi-extension/main.tf b/patterns/vsi-extension/main.tf index cc898d380..5eede5423 100644 --- a/patterns/vsi-extension/main.tf +++ b/patterns/vsi-extension/main.tf @@ -40,7 +40,6 @@ locals { subnet if can(regex(local.default_subnet_name, subnet.name)) ] - existing_kms_instance_guid = var.boot_volume_encryption_key == null ? null : split(":", var.boot_volume_encryption_key)[7] } module "vsi" { @@ -58,7 +57,6 @@ module "vsi" { user_data = var.user_data image_id = data.ibm_is_image.image.id boot_volume_encryption_key = var.boot_volume_encryption_key - existing_kms_instance_guid = local.existing_kms_instance_guid security_group_ids = var.security_group_ids ssh_key_ids = [local.ssh_key_id] machine_type = var.vsi_instance_profile From 335abc309ed168ae8559d8c9699c82cd536e2fa4 Mon Sep 17 00:00:00 2001 From: Todd Giguere Date: Thu, 22 May 2025 10:32:24 -0400 Subject: [PATCH 6/7] fix: update to latest vpc module version --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index e14b82aa9..8ef493ec0 100644 --- a/main.tf +++ b/main.tf @@ -33,7 +33,7 @@ locals { # Due to existing implicit dependencies we do not think this will be an issue, including auth policies for activity tracker. module "vpc" { source = "terraform-ibm-modules/landing-zone-vpc/ibm" - version = "7.23.10" + version = "7.23.11" for_each = local.vpc_map name = each.value.prefix existing_vpc_id = each.value.existing_vpc_id From e153963ab7564da2292f7d342082d46ae6cd3324 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Mon, 26 May 2025 17:19:06 +0100 Subject: [PATCH 7/7] bump to latest - SKIP UPGRADE TEST --- README.md | 10 +++++----- bastion_host.tf | 2 +- cluster.tf | 2 +- f5_vsi.tf | 2 +- main.tf | 2 +- patterns/vsi-extension/main.tf | 2 +- virtual_servers.tf | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7eed8d1df..9ef5b941b 100644 --- a/README.md +++ b/README.md @@ -851,17 +851,17 @@ module "cluster_pattern" { | Name | Source | Version | |------|--------|---------| -| [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.18 | -| [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.47.2 | +| [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.23 | +| [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.48.3 | | [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a | -| [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.18 | +| [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.23 | | [key\_management](#module\_key\_management) | ./kms | n/a | | [placement\_group\_map](#module\_placement\_group\_map) | ./dynamic_values/config_modules/list_to_map | n/a | | [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a | | [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a | | [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.31.0 | -| [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.23.10 | -| [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.18 | +| [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.23.12 | +| [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.23 | ### Resources diff --git a/bastion_host.tf b/bastion_host.tf index 1cb5af4b9..5893edefd 100644 --- a/bastion_host.tf +++ b/bastion_host.tf @@ -42,7 +42,7 @@ module "teleport_config" { module "bastion_host" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "5.1.18" + version = "5.1.23" for_each = local.bastion_vsi_map resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group] create_security_group = each.value.security_group == null ? false : true diff --git a/cluster.tf b/cluster.tf index 7f1346d3d..9843ca260 100644 --- a/cluster.tf +++ b/cluster.tf @@ -244,7 +244,7 @@ module "cluster" { if cluster.kube_type == "openshift" } source = "terraform-ibm-modules/base-ocp-vpc/ibm" - version = "3.47.2" + version = "3.48.3" resource_group_id = local.resource_groups[each.value.resource_group] region = var.region cluster_name = each.value.cluster_name diff --git a/f5_vsi.tf b/f5_vsi.tf index 73fdfc5b1..c34faef91 100644 --- a/f5_vsi.tf +++ b/f5_vsi.tf @@ -117,7 +117,7 @@ locals { module "f5_vsi" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "5.1.18" + version = "5.1.23" for_each = local.f5_vsi_map resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group] create_security_group = each.value.security_group == null ? false : true diff --git a/main.tf b/main.tf index 8ef493ec0..785a4770a 100644 --- a/main.tf +++ b/main.tf @@ -33,7 +33,7 @@ locals { # Due to existing implicit dependencies we do not think this will be an issue, including auth policies for activity tracker. module "vpc" { source = "terraform-ibm-modules/landing-zone-vpc/ibm" - version = "7.23.11" + version = "7.23.12" for_each = local.vpc_map name = each.value.prefix existing_vpc_id = each.value.existing_vpc_id diff --git a/patterns/vsi-extension/main.tf b/patterns/vsi-extension/main.tf index 5eede5423..cb15c6a98 100644 --- a/patterns/vsi-extension/main.tf +++ b/patterns/vsi-extension/main.tf @@ -44,7 +44,7 @@ locals { module "vsi" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "5.1.18" + version = "5.1.23" resource_group_id = data.ibm_is_vpc.vpc_by_id.resource_group create_security_group = true prefix = "${var.prefix}-vsi" diff --git a/virtual_servers.tf b/virtual_servers.tf index dc69f8012..c38b427e0 100644 --- a/virtual_servers.tf +++ b/virtual_servers.tf @@ -41,7 +41,7 @@ data "ibm_is_image" "image" { module "vsi" { source = "terraform-ibm-modules/landing-zone-vsi/ibm" - version = "5.1.18" + version = "5.1.23" for_each = local.vsi_map resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group] create_security_group = each.value.security_group == null ? false : true