diff --git a/README.md b/README.md
index 305cd369b..dcf022d7b 100644
--- a/README.md
+++ b/README.md
@@ -856,7 +856,7 @@ module "cluster_pattern" {
| [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 |
-| [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.17.1 |
+| [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.18.0 |
| [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 3.2.4 |
### Resources
@@ -891,10 +891,12 @@ module "cluster_pattern" {
| [random_string.random_cos_suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
| [time_sleep.wait_30_seconds](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
| [time_sleep.wait_for_authorization_policy](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
+| [time_sleep.wait_for_vpc_creation_data](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
| [ibm_container_addons.existing_addons](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_addons) | data source |
| [ibm_container_cluster_versions.cluster_versions](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_cluster_versions) | data source |
| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/iam_account_settings) | data source |
| [ibm_is_image.image](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/is_image) | data source |
+| [ibm_is_vpc.vpc](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/is_vpc) | data source |
| [ibm_resource_group.resource_groups](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/resource_group) | data source |
| [ibm_resource_instance.appid](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/resource_instance) | data source |
| [ibm_resource_instance.cos](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/resource_instance) | data source |
@@ -906,7 +908,7 @@ module "cluster_pattern" {
| [appid](#input\_appid) | The App ID instance to be used for the teleport vsi deployments | object({
name = optional(string)
resource_group = optional(string)
use_data = optional(bool)
keys = optional(list(string))
use_appid = bool
}) | {
"use_appid": false
} | no |
| [atracker](#input\_atracker) | atracker variables | object({
resource_group = string
receive_global_events = bool
collector_bucket_name = string
add_route = bool
}) | n/a | yes |
| [clusters](#input\_clusters) | A list describing clusters workloads to create | list(
object({
name = string # Name of Cluster
vpc_name = string # Name of VPC
subnet_names = list(string) # List of vpc subnets for cluster
workers_per_subnet = number # Worker nodes per subnet.
machine_type = string # Worker node flavor
kube_type = string # iks or openshift
kube_version = optional(string) # Can be a version from `ibmcloud ks versions` or `default`
entitlement = optional(string) # entitlement option for openshift
secondary_storage = optional(string) # Secondary storage type
pod_subnet = optional(string) # Portable subnet for pods
service_subnet = optional(string) # Portable subnet for services
resource_group = string # Resource Group used for cluster
cos_name = optional(string) # Name of COS instance Required only for OpenShift clusters
access_tags = optional(list(string), [])
boot_volume_crk_name = optional(string) # Boot volume encryption key name
disable_public_endpoint = optional(bool, true) # disable cluster public, leaving only private endpoint
disable_outbound_traffic_protection = optional(bool, false) # public outbound access from the cluster workers
addons = optional(object({ # Map of OCP cluster add-on versions to install
debug-tool = optional(string)
image-key-synchronizer = optional(string)
openshift-data-foundation = optional(string)
vpc-file-csi-driver = optional(string)
static-route = optional(string)
cluster-autoscaler = optional(string)
vpc-block-csi-driver = optional(string)
}), {})
manage_all_addons = optional(bool, false) # Instructs Terraform to manage all cluster addons, even if addons were installed outside of the module. If set to 'true' this module will destroy any addons that were installed by other sources.
kms_config = optional(
object({
crk_name = string # Name of key
private_endpoint = optional(bool) # Private endpoint
})
)
worker_pools = optional(
list(
object({
name = string # Worker pool name
vpc_name = string # VPC name
workers_per_subnet = number # Worker nodes per subnet
flavor = string # Worker node flavor
subnet_names = list(string) # List of vpc subnets for worker pool
entitlement = optional(string) # entitlement option for openshift
secondary_storage = optional(string) # Secondary storage type
boot_volume_crk_name = optional(string) # Boot volume encryption key name
})
)
)
})
)
| n/a | yes |
-| [cos](#input\_cos) | Object describing the cloud object storage instance, buckets, and keys. Set `use_data` to false to create instance | list(
object({
name = string
use_data = optional(bool)
resource_group = string
plan = optional(string)
random_suffix = optional(bool) # Use a random suffix for COS instance
access_tags = optional(list(string), [])
buckets = list(object({
name = string
storage_class = string
endpoint_type = string
force_delete = bool
single_site_location = optional(string)
region_location = optional(string)
cross_region_location = optional(string)
kms_key = optional(string)
access_tags = optional(list(string), [])
allowed_ip = optional(list(string))
hard_quota = optional(number)
archive_rule = optional(object({
days = number
enable = bool
rule_id = optional(string)
type = string
}))
expire_rule = optional(object({
days = optional(number)
date = optional(string)
enable = bool
expired_object_delete_marker = optional(string)
prefix = optional(string)
rule_id = optional(string)
}))
activity_tracking = optional(object({
activity_tracker_crn = string
read_data_events = bool
write_data_events = bool
}))
metrics_monitoring = optional(object({
metrics_monitoring_crn = string
request_metrics_enabled = optional(bool)
usage_metrics_enabled = optional(bool)
}))
}))
keys = optional(
list(object({
name = string
role = string
enable_HMAC = bool
}))
)
})
)
| n/a | yes |
+| [cos](#input\_cos) | Object describing the cloud object storage instance, buckets, and keys. Set `use_data` to false to create instance | list(
object({
name = string
use_data = optional(bool)
resource_group = string
plan = optional(string)
random_suffix = optional(bool) # Use a random suffix for COS instance
access_tags = optional(list(string), [])
buckets = list(object({
name = string
storage_class = string
endpoint_type = string
force_delete = bool
single_site_location = optional(string)
region_location = optional(string)
cross_region_location = optional(string)
kms_key = optional(string)
access_tags = optional(list(string), [])
allowed_ip = optional(list(string), [])
hard_quota = optional(number)
archive_rule = optional(object({
days = number
enable = bool
rule_id = optional(string)
type = string
}))
expire_rule = optional(object({
days = optional(number)
date = optional(string)
enable = bool
expired_object_delete_marker = optional(string)
prefix = optional(string)
rule_id = optional(string)
}))
activity_tracking = optional(object({
activity_tracker_crn = string
read_data_events = bool
write_data_events = bool
}))
metrics_monitoring = optional(object({
metrics_monitoring_crn = string
request_metrics_enabled = optional(bool)
usage_metrics_enabled = optional(bool)
}))
}))
keys = optional(
list(object({
name = string
role = string
enable_HMAC = bool
}))
)
})
)
| n/a | yes |
| [enable\_transit\_gateway](#input\_enable\_transit\_gateway) | Create transit gateway | `bool` | `true` | no |
| [f5\_template\_data](#input\_f5\_template\_data) | Data for all f5 templates | object({
tmos_admin_password = optional(string)
license_type = optional(string)
byol_license_basekey = optional(string)
license_host = optional(string)
license_username = optional(string)
license_password = optional(string)
license_pool = optional(string)
license_sku_keyword_1 = optional(string)
license_sku_keyword_2 = optional(string)
license_unit_of_measure = optional(string)
do_declaration_url = optional(string)
as3_declaration_url = optional(string)
ts_declaration_url = optional(string)
phone_home_url = optional(string)
template_source = optional(string)
template_version = optional(string)
app_id = optional(string)
tgactive_url = optional(string)
tgstandby_url = optional(string)
tgrefresh_url = optional(string)
}) | {
"license_type": "none"
} | no |
| [f5\_vsi](#input\_f5\_vsi) | A list describing F5 VSI workloads to create | list(
object({
name = string
vpc_name = string
primary_subnet_name = string
secondary_subnet_names = list(string)
secondary_subnet_security_group_names = list(
object({
group_name = string
interface_name = string
})
)
ssh_keys = list(string)
f5_image_name = string
machine_type = string
resource_group = optional(string)
enable_management_floating_ip = optional(bool)
enable_external_floating_ip = optional(bool)
security_groups = optional(list(string))
boot_volume_encryption_key_name = optional(string)
hostname = string
domain = string
access_tags = optional(list(string), [])
security_group = optional(
object({
name = string
rules = list(
object({
name = string
direction = string
source = string
tcp = optional(
object({
port_max = number
port_min = number
})
)
udp = optional(
object({
port_max = number
port_min = number
})
)
icmp = optional(
object({
type = number
code = number
})
)
})
)
})
)
block_storage_volumes = optional(list(
object({
name = string
profile = string
capacity = optional(number)
iops = optional(number)
encryption_key = optional(string)
})
))
load_balancers = optional(list(
object({
name = string
type = string
listener_port = number
listener_protocol = string
connection_limit = number
algorithm = string
protocol = string
health_delay = number
health_retries = number
health_timeout = number
health_type = string
pool_member_port = string
idle_connection_timeout = optional(number)
security_group = optional(
object({
name = string
rules = list(
object({
name = string
direction = string
source = string
tcp = optional(
object({
port_max = number
port_min = number
})
)
udp = optional(
object({
port_max = number
port_min = number
})
)
icmp = optional(
object({
type = number
code = number
})
)
})
)
})
)
})
))
})
)
| `[]` | no |
diff --git a/common-dev-assets b/common-dev-assets
index 2015ae993..8e46aa217 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 2015ae9933bef5947865c5251e49009bfd06e66c
+Subproject commit 8e46aa2179b3c8f495b5f3cf4f73966692c8e2e7
diff --git a/main.tf b/main.tf
index 8ee6b61d3..3ab77a8b5 100644
--- a/main.tf
+++ b/main.tf
@@ -2,6 +2,27 @@
# Create VPCs
##############################################################################
+data "ibm_is_vpc" "vpc" {
+ for_each = module.vpc
+ identifier = each.value.vpc_id
+ depends_on = [time_sleep.wait_for_vpc_creation_data]
+}
+
+resource "time_sleep" "wait_for_vpc_creation_data" {
+ depends_on = [
+ resource.ibm_is_security_group.security_group,
+ resource.ibm_is_security_group_rule.security_group_rules,
+ resource.ibm_container_vpc_cluster.cluster,
+ resource.ibm_container_vpc_worker_pool.pool,
+ resource.ibm_is_virtual_endpoint_gateway.endpoint_gateway,
+ resource.ibm_tg_connection.connection,
+ module.f5_vsi,
+ module.vsi,
+ module.vpc
+ ]
+ create_duration = "30s"
+}
+
locals {
vpc_map = module.dynamic_values.vpc_map
}
@@ -12,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.17.1"
+ version = "7.18.0"
for_each = local.vpc_map
name = each.value.prefix
existing_vpc_id = each.value.existing_vpc_id
diff --git a/outputs.tf b/outputs.tf
index 576c7aeb5..141fe2498 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -188,8 +188,13 @@ output "vpc_names" {
output "vpc_data" {
description = "List of VPC data"
value = [
- for network in module.vpc :
- network
+ for k, a in module.vpc :
+ merge(
+ a,
+ {
+ vpc_data = data.ibm_is_vpc.vpc[k]
+ }
+ )
]
}
diff --git a/patterns/roks-quickstart/catalogValidationValues.json.template b/patterns/roks-quickstart/catalogValidationValues.json.template
index 8e580fd34..d761afae4 100644
--- a/patterns/roks-quickstart/catalogValidationValues.json.template
+++ b/patterns/roks-quickstart/catalogValidationValues.json.template
@@ -1,6 +1,6 @@
{
"ibmcloud_api_key": $VALIDATION_APIKEY,
"region": "us-south",
- "tags": $TAGS,
+ "resource_tags": $TAGS,
"prefix": $PREFIX
}
diff --git a/patterns/vsi-quickstart/catalogValidationValues.json.template b/patterns/vsi-quickstart/catalogValidationValues.json.template
index a13d813aa..2030e63bb 100644
--- a/patterns/vsi-quickstart/catalogValidationValues.json.template
+++ b/patterns/vsi-quickstart/catalogValidationValues.json.template
@@ -1 +1,6 @@
-{"ibmcloud_api_key": $VALIDATION_APIKEY, "region": "eu-de", "resource_tags": $TAGS, "prefix": $PREFIX}
+{
+ "ibmcloud_api_key": $VALIDATION_APIKEY,
+ "region": "eu-de",
+ "resource_tags": $TAGS,
+ "prefix": $PREFIX
+}
diff --git a/variables.tf b/variables.tf
index a2d47117c..caff234e9 100644
--- a/variables.tf
+++ b/variables.tf
@@ -500,7 +500,7 @@ variable "cos" {
cross_region_location = optional(string)
kms_key = optional(string)
access_tags = optional(list(string), [])
- allowed_ip = optional(list(string))
+ allowed_ip = optional(list(string), [])
hard_quota = optional(number)
archive_rule = optional(object({
days = number