Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -851,17 +851,17 @@ module "cluster_pattern" {

| Name | Source | Version |
|------|--------|---------|
| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.4.0 |
| <a name="module_cluster"></a> [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.41.7 |
| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.6.0 |
| <a name="module_cluster"></a> [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.44.0 |
| <a name="module_dynamic_values"></a> [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a |
| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.4.0 |
| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.6.0 |
| <a name="module_key_management"></a> [key\_management](#module\_key\_management) | ./kms | n/a |
| <a name="module_placement_group_map"></a> [placement\_group\_map](#module\_placement\_group\_map) | ./dynamic_values/config_modules/list_to_map | n/a |
| <a name="module_ssh_keys"></a> [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a |
| <a name="module_teleport_config"></a> [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a |
| <a name="module_update_cbr_vpc_zone"></a> [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.27.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.20.1 |
| <a name="module_vsi"></a> [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.4.0 |
| <a name="module_update_cbr_vpc_zone"></a> [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.29.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.22.8 |
| <a name="module_vsi"></a> [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.6.0 |

### Resources

Expand Down
2 changes: 1 addition & 1 deletion bastion_host.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cbr.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ module "cluster" {
if cluster.kube_type == "openshift"
}
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.41.7"
version = "3.44.0"
resource_group_id = local.resource_groups[each.value.resource_group]
region = var.region
cluster_name = each.value.cluster_name
Expand Down
2 changes: 1 addition & 1 deletion f5_vsi.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.1"
version = "7.22.8"
for_each = local.vpc_map
name = each.value.prefix
existing_vpc_id = each.value.existing_vpc_id
Expand Down
2 changes: 1 addition & 1 deletion patterns/vsi-extension/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/pr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 "<prefix>-management-vpc"
// Loop through the vpcs and find the vpc_id when vpc_name is "<prefix>-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
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/resources/slz-vpc/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ 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"
}

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"
Expand Down
2 changes: 1 addition & 1 deletion virtual_servers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down