From 4ba74e4f1eedcc805358d24cf8531f4dbebbc049 Mon Sep 17 00:00:00 2001 From: Terraform IBM Modules Operations Date: Sat, 15 Feb 2025 05:50:58 +0000 Subject: [PATCH 1/4] fix(deps): update terraform-module --- bastion_host.tf | 2 +- cbr.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, 7 insertions(+), 7 deletions(-) diff --git a/bastion_host.tf b/bastion_host.tf index 9c840efee..109498cfc 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.4.0" + version = "4.6.0" 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/cbr.tf b/cbr.tf index ef8affc08..5f566cfa3 100644 --- a/cbr.tf +++ b/cbr.tf @@ -3,7 +3,7 @@ ############################################################################## module "update_cbr_vpc_zone" { source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module" - version = "1.27.0" + version = "1.29.0" count = var.existing_vpc_cbr_zone_id != null ? 1 : 0 use_existing_cbr_zone = true existing_zone_id = var.existing_vpc_cbr_zone_id diff --git a/cluster.tf b/cluster.tf index 6c7adff04..1865d3b1f 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.37.3" + version = "3.41.0" 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 14f3ae8b5..5b71468e5 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.4.0" + version = "4.6.0" 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 4fbeca447..e6659638f 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.19.0" + version = "7.19.1" 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 ac1f7869a..f7df25658 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.4.0" + version = "4.6.0" 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 1de6a1392..748c756ad 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.4.0" + version = "4.6.0" 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 9136eb0516d92219e12c2195d19ca83a67343d9b Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Thu, 10 Apr 2025 18:51:59 +0530 Subject: [PATCH 2/4] test --- tests/pr_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 6881f534f..96cbd812d 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -443,9 +443,9 @@ func setupOptionsVsiExtention(t *testing.T, prefix string, region string, existi fmt.Println(err) return nil } - // Loop through the vpcs and find the vpc_id when vpc_name is "-management-vpc" + // Loop through the vpcs and find the vpc_id when vpc_name is "-management" for _, vpc := range vpcs { - if vpc.VpcName == fmt.Sprintf("%s-management-vpc", prefix) { + if vpc.VpcName == fmt.Sprintf("%s-management", prefix) { managementVpcID = vpc.VpcID } } From 42b5c94f39402be3331dca33f560631ad1b1c028 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Thu, 10 Apr 2025 18:57:44 +0530 Subject: [PATCH 3/4] update --- tests/resources/slz-vpc/outputs.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/resources/slz-vpc/outputs.tf b/tests/resources/slz-vpc/outputs.tf index 2f2d3101f..c2279f582 100644 --- a/tests/resources/slz-vpc/outputs.tf +++ b/tests/resources/slz-vpc/outputs.tf @@ -9,7 +9,7 @@ output "prefix" { output "management_vpc_id" { value = lookup( - [for vpc in module.landing_zone.vpc_data : vpc if vpc.vpc_name == "${var.prefix}-management-vpc"][0], + [for vpc in module.landing_zone.vpc_data : vpc if vpc.vpc_name == "${var.prefix}-management"][0], "vpc_id", "") description = "Management VPC ID" @@ -17,7 +17,7 @@ output "management_vpc_id" { output "workload_vpc_id" { value = lookup( - [for vpc in module.landing_zone.vpc_data : vpc if vpc.vpc_name == "${var.prefix}-workload-vpc"][0], + [for vpc in module.landing_zone.vpc_data : vpc if vpc.vpc_name == "${var.prefix}-workload"][0], "vpc_id", "") description = "Workload VPC ID" From 4ebfc138e9eb03400f9322c6b9f5cca26992174d Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Thu, 10 Apr 2025 20:04:13 +0530 Subject: [PATCH 4/4] SKIP UPGRADE TEST