From 45c00473ca9ab56fc33be8036685663de0940ff6 Mon Sep 17 00:00:00 2001 From: Aashiq Jacob <122446118+Aashiq-J@users.noreply.github.com> Date: Thu, 19 Jun 2025 18:05:27 +0530 Subject: [PATCH 01/11] fix: increment counter for failed tries --- scripts/reset_iks_api_key.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/reset_iks_api_key.sh b/scripts/reset_iks_api_key.sh index 6be9fcfe..0fda79ee 100755 --- a/scripts/reset_iks_api_key.sh +++ b/scripts/reset_iks_api_key.sh @@ -107,7 +107,7 @@ if [ "${reset}" == true ]; then echo "ERROR:: FAILED TO RESET THE IAM API KEY" echo "$result" sleep $retry_wait_time - ((attempt++)) + attempt=$((attempt+1)) fi # sleep for 10 secs to allow the new key to be replicated across backend DB instances before attempting to create cluster done From c3e75d26bb893b21b8528e00952f934f19071bd1 Mon Sep 17 00:00:00 2001 From: Aashiq Jacob <122446118+Aashiq-J@users.noreply.github.com> Date: Thu, 19 Jun 2025 18:12:58 +0530 Subject: [PATCH 02/11] Update enable_disable_ocp_console.sh --- scripts/enable_disable_ocp_console.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/enable_disable_ocp_console.sh b/scripts/enable_disable_ocp_console.sh index 6b5eb994..c35a85e4 100755 --- a/scripts/enable_disable_ocp_console.sh +++ b/scripts/enable_disable_ocp_console.sh @@ -28,7 +28,7 @@ function apply_oc_patch() { else echo "Failed to apply patch. Retrying in ${retry_wait_time}s..." sleep $retry_wait_time - ((attempt++)) + attempt=$((attempt+1)) fi done @@ -50,7 +50,7 @@ function remove_oc_patch() { else echo "Failed to remove patch. Retrying in ${retry_wait_time}s..." sleep $retry_wait_time - ((attempt++)) + attempt=$((attempt+1)) fi done From 1aa669c6261cf27364a1c148b8eb8f25003108cd Mon Sep 17 00:00:00 2001 From: Aashiq Jacob <122446118+Aashiq-J@users.noreply.github.com> Date: Thu, 19 Jun 2025 18:13:50 +0530 Subject: [PATCH 03/11] Update set_audit_log_policy.sh --- modules/kube-audit/scripts/set_audit_log_policy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kube-audit/scripts/set_audit_log_policy.sh b/modules/kube-audit/scripts/set_audit_log_policy.sh index b4dc2030..c82d77b3 100755 --- a/modules/kube-audit/scripts/set_audit_log_policy.sh +++ b/modules/kube-audit/scripts/set_audit_log_policy.sh @@ -27,7 +27,7 @@ function apply_oc_patch() { else echo "Failed to apply patch. Retrying in ${RETRY_WAIT}s..." sleep $RETRY_WAIT - ((attempt++)) + attempt=$((attempt+1)) RETRY_WAIT=$((RETRY_WAIT * 2)) fi done From c666588890acb558ea609c0852db161938c32067 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Fri, 20 Jun 2025 22:42:25 +0530 Subject: [PATCH 04/11] fix: manage the odf in the OCP DA --- solutions/fully-configurable/main.tf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 29c3607d..2e13c563 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -191,6 +191,13 @@ locals { additional_security_group_ids = pool.additional_security_group_ids subnet_prefix = "default" } if length(pool.vpc_subnets) == 0]) + + # Managing the ODF version accordingly, as it changes with each OCP version. + addons = lookup(var.addons, "openshift-data-foundation", null) != null ? lookup(var.addons["openshift-data-foundation"], "version", null) == null ? { for key, value in var.addons : + key => value != null ? { + version = lookup(value, "version", null) == null && key == "openshift-data-foundation" ? "${var.ocp_version}.0" : lookup(value, "version", null) + parameters_json = lookup(value, "parameters_json", null) + } : null } : var.addons : var.addons } module "ocp_base" { @@ -210,7 +217,7 @@ module "ocp_base" { ocp_entitlement = var.ocp_entitlement additional_lb_security_group_ids = var.additional_lb_security_group_ids additional_vpe_security_group_ids = var.additional_vpe_security_group_ids - addons = var.addons + addons = local.addons allow_default_worker_pool_replacement = var.allow_default_worker_pool_replacement attach_ibm_managed_security_group = var.attach_ibm_managed_security_group cluster_config_endpoint_type = var.cluster_config_endpoint_type From 3f3bc7a8c2668adde26a6e24775f1ea16da060b7 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Mon, 23 Jun 2025 18:58:26 +0530 Subject: [PATCH 05/11] adding subnet virtual variable to manage the subnets in other DA above OCP --- ibm_catalog.json | 26 ++++++--- solutions/fully-configurable/variables.tf | 66 +++++++++++++++++++++++ 2 files changed, 85 insertions(+), 7 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 3861d0ab..55d389b2 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -92,8 +92,10 @@ }, { "service_name": "is.vpc", - "role_crns": ["crn:v1:bluemix:public:iam::::role:Administrator"], - "notes": "Required for creating Virtual Private Cloud(VPC)." + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Administrator" + ], + "notes": "Required for creating Virtual Private Cloud(VPC)." }, { "service_name": "cloud-object-storage", @@ -140,7 +142,7 @@ "role_crns": [ "crn:v1:bluemix:public:iam::::serviceRole:Manager" ], - "notes": "[Optional] Required if you are consuming Observability deployable architecture which sets up Logs Routing." + "notes": "[Optional] Required if you are consuming Observability deployable architecture which sets up Logs Routing." }, { "service_name": "atracker", @@ -266,7 +268,8 @@ { "displayname": "cx2.16x32", "value": "cx2.16x32" - },{ + }, + { "displayname": "cx2.32x64", "value": "cx2.32x64" }, @@ -362,7 +365,8 @@ "displayname": "mx2d.metal.96x768 (Only available in Toronto (ca-tor))) ", "value": "mx2d.metal.96x768" }, - { "displayname": "mx2.16x128.2000gb (Not available in Sao Paulo (br-sao), Montreal (ca-mon), Madrid (eu-es), Osaka (jp-osa))", + { + "displayname": "mx2.16x128.2000gb (Not available in Sao Paulo (br-sao), Montreal (ca-mon), Madrid (eu-es), Osaka (jp-osa))", "value": "mx2.16x128.2000gb" }, { @@ -706,6 +710,9 @@ { "key": "skip_ocp_secrets_manager_iam_auth_policy" }, + { + "key": "subnets" + }, { "key": "provider_visibility", "options": [ @@ -749,13 +756,18 @@ "reference_version": true }, { - "dependency_input":"region", - "version_input":"region", + "dependency_input": "region", + "version_input": "region", "reference_version": true }, { "dependency_output": "vpc_crn", "version_input": "existing_vpc_crn" + }, + { + "dependency_input": "subnets", + "version_input": "subnets", + "reference_version": true } ] }, diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 894c874b..d8162984 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -571,3 +571,69 @@ variable "skip_ocp_secrets_manager_iam_auth_policy" { description = "To skip creating auth policy that allows OCP cluster 'Manager' role access in the existing Secrets Manager instance for managing ingress certificates." default = false } + +# tflint-ignore: all +variable "subnets" { + description = "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-)." + type = object({ + zone-1 = list(object({ + name = string + cidr = string + public_gateway = optional(bool) + acl_name = string + no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true + subnet_tags = optional(list(string), []) + })) + zone-2 = optional(list(object({ + name = string + cidr = string + public_gateway = optional(bool) + acl_name = string + no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true + subnet_tags = optional(list(string), []) + }))) + zone-3 = optional(list(object({ + name = string + cidr = string + public_gateway = optional(bool) + acl_name = string + no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true + subnet_tags = optional(list(string), []) + }))) + }) + + default = { + zone-1 = [ + { + name = "subnet-a" + cidr = "10.10.10.0/24" + public_gateway = true + acl_name = "vpc-acl" + no_addr_prefix = false + } + ], + zone-2 = [ + { + name = "subnet-b" + cidr = "10.20.10.0/24" + public_gateway = false + acl_name = "vpc-acl" + no_addr_prefix = false + } + ], + zone-3 = [ + { + name = "subnet-c" + cidr = "10.30.10.0/24" + public_gateway = false + acl_name = "vpc-acl" + no_addr_prefix = false + } + ] + } + + validation { + condition = alltrue([for key, value in var.subnets : value != null ? length([for subnet in value : subnet.public_gateway if subnet.public_gateway]) > 1 ? false : true : true]) + error_message = "var.subnets has more than one public gateway in a zone. Only one public gateway can be attached to a zone for the virtual private cloud." + } +} From 5f1908c6dcf3bc4bf069006d2ec0830cefcc2e0f Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Tue, 24 Jun 2025 14:13:23 +0530 Subject: [PATCH 06/11] update --- solutions/fully-configurable/variables.tf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index d8162984..d7caabef 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -631,9 +631,4 @@ variable "subnets" { } ] } - - validation { - condition = alltrue([for key, value in var.subnets : value != null ? length([for subnet in value : subnet.public_gateway if subnet.public_gateway]) > 1 ? false : true : true]) - error_message = "var.subnets has more than one public gateway in a zone. Only one public gateway can be attached to a zone for the virtual private cloud." - } } From 67db7e556aef74cbeb67e127c4b92fe909d52fc5 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Wed, 25 Jun 2025 11:34:51 +0530 Subject: [PATCH 07/11] test --- ibm_catalog.json | 7 +- solutions/fully-configurable/variables.tf | 120 +++++++++++----------- 2 files changed, 66 insertions(+), 61 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 55d389b2..01367bfc 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -711,7 +711,12 @@ "key": "skip_ocp_secrets_manager_iam_auth_policy" }, { - "key": "subnets" + "key": "subnets", + "type": "object({zone-1 = list(object({name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), })) zone-2 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) zone-3 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) })", + "default_value": "{ zone-1 = [ { name = \"subnet-a\", cidr = \"10.10.10.0/24\", public_gateway = true, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-2 = [ { name = \"subnet-b\", cidr = \"10.20.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-3 = [ { name = \"subnet-c\", cidr = \"10.30.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ] }", + "description": "Test", + "required": true, + "virtual": true }, { "key": "provider_visibility", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index d7caabef..44897e5f 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -572,63 +572,63 @@ variable "skip_ocp_secrets_manager_iam_auth_policy" { default = false } -# tflint-ignore: all -variable "subnets" { - description = "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-)." - type = object({ - zone-1 = list(object({ - name = string - cidr = string - public_gateway = optional(bool) - acl_name = string - no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true - subnet_tags = optional(list(string), []) - })) - zone-2 = optional(list(object({ - name = string - cidr = string - public_gateway = optional(bool) - acl_name = string - no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true - subnet_tags = optional(list(string), []) - }))) - zone-3 = optional(list(object({ - name = string - cidr = string - public_gateway = optional(bool) - acl_name = string - no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true - subnet_tags = optional(list(string), []) - }))) - }) - - default = { - zone-1 = [ - { - name = "subnet-a" - cidr = "10.10.10.0/24" - public_gateway = true - acl_name = "vpc-acl" - no_addr_prefix = false - } - ], - zone-2 = [ - { - name = "subnet-b" - cidr = "10.20.10.0/24" - public_gateway = false - acl_name = "vpc-acl" - no_addr_prefix = false - } - ], - zone-3 = [ - { - name = "subnet-c" - cidr = "10.30.10.0/24" - public_gateway = false - acl_name = "vpc-acl" - no_addr_prefix = false - } - ] - } -} +# # tflint-ignore: all +# variable "subnets" { +# description = "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-)." +# type = object({ +# zone-1 = list(object({ +# name = string +# cidr = string +# public_gateway = optional(bool) +# acl_name = string +# no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true +# subnet_tags = optional(list(string), []) +# })) +# zone-2 = optional(list(object({ +# name = string +# cidr = string +# public_gateway = optional(bool) +# acl_name = string +# no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true +# subnet_tags = optional(list(string), []) +# }))) +# zone-3 = optional(list(object({ +# name = string +# cidr = string +# public_gateway = optional(bool) +# acl_name = string +# no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true +# subnet_tags = optional(list(string), []) +# }))) +# }) + +# default = { +# zone-1 = [ +# { +# name = "subnet-a" +# cidr = "10.10.10.0/24" +# public_gateway = true +# acl_name = "vpc-acl" +# no_addr_prefix = false +# } +# ], +# zone-2 = [ +# { +# name = "subnet-b" +# cidr = "10.20.10.0/24" +# public_gateway = false +# acl_name = "vpc-acl" +# no_addr_prefix = false +# } +# ], +# zone-3 = [ +# { +# name = "subnet-c" +# cidr = "10.30.10.0/24" +# public_gateway = false +# acl_name = "vpc-acl" +# no_addr_prefix = false +# } +# ] +# } +# } From a015ceb43794d32a4b23c7ce2ad4b9deb62a4144 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Wed, 25 Jun 2025 12:30:26 +0530 Subject: [PATCH 08/11] update --- ibm_catalog.json | 3 +- solutions/fully-configurable/variables.tf | 61 ----------------------- 2 files changed, 1 insertion(+), 63 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 01367bfc..7fbf334b 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -714,8 +714,7 @@ "key": "subnets", "type": "object({zone-1 = list(object({name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), })) zone-2 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) zone-3 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) })", "default_value": "{ zone-1 = [ { name = \"subnet-a\", cidr = \"10.10.10.0/24\", public_gateway = true, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-2 = [ { name = \"subnet-b\", cidr = \"10.20.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-3 = [ { name = \"subnet-c\", cidr = \"10.30.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ] }", - "description": "Test", - "required": true, + "description": "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-).", "virtual": true }, { diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 44897e5f..894c874b 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -571,64 +571,3 @@ variable "skip_ocp_secrets_manager_iam_auth_policy" { description = "To skip creating auth policy that allows OCP cluster 'Manager' role access in the existing Secrets Manager instance for managing ingress certificates." default = false } - -# # tflint-ignore: all -# variable "subnets" { -# description = "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-)." -# type = object({ -# zone-1 = list(object({ -# name = string -# cidr = string -# public_gateway = optional(bool) -# acl_name = string -# no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true -# subnet_tags = optional(list(string), []) -# })) -# zone-2 = optional(list(object({ -# name = string -# cidr = string -# public_gateway = optional(bool) -# acl_name = string -# no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true -# subnet_tags = optional(list(string), []) -# }))) -# zone-3 = optional(list(object({ -# name = string -# cidr = string -# public_gateway = optional(bool) -# acl_name = string -# no_addr_prefix = optional(bool, false) # do not automatically add address prefix for subnet, overrides other conditions if set to true -# subnet_tags = optional(list(string), []) -# }))) -# }) - -# default = { -# zone-1 = [ -# { -# name = "subnet-a" -# cidr = "10.10.10.0/24" -# public_gateway = true -# acl_name = "vpc-acl" -# no_addr_prefix = false -# } -# ], -# zone-2 = [ -# { -# name = "subnet-b" -# cidr = "10.20.10.0/24" -# public_gateway = false -# acl_name = "vpc-acl" -# no_addr_prefix = false -# } -# ], -# zone-3 = [ -# { -# name = "subnet-c" -# cidr = "10.30.10.0/24" -# public_gateway = false -# acl_name = "vpc-acl" -# no_addr_prefix = false -# } -# ] -# } -# } From b395190f480d7e267de4457c6c919da744db2904 Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Wed, 25 Jun 2025 12:32:50 +0530 Subject: [PATCH 09/11] test --- ibm_catalog.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 7fbf334b..6611d974 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -715,7 +715,12 @@ "type": "object({zone-1 = list(object({name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), })) zone-2 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) zone-3 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) })", "default_value": "{ zone-1 = [ { name = \"subnet-a\", cidr = \"10.10.10.0/24\", public_gateway = true, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-2 = [ { name = \"subnet-b\", cidr = \"10.20.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-3 = [ { name = \"subnet-c\", cidr = \"10.30.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ] }", "description": "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-).", - "virtual": true + "virtual": true, + "custom_config": { + "type": "textarea", + "grouping": "deployment", + "original_grouping": "deployment" + } }, { "key": "provider_visibility", From c55805c4599304cf1ccd1ad37ae201dd74b870ce Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Wed, 25 Jun 2025 14:53:21 +0530 Subject: [PATCH 10/11] test --- ibm_catalog.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 3154080f..9832fddd 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -727,15 +727,12 @@ }, { "key": "subnets", - "type": "object({zone-1 = list(object({name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), })) zone-2 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) zone-3 = optional(list(object({ name = string, cidr = string, public_gateway = optional(bool), acl_name = string, no_addr_prefix = optional(bool, false), subnet_tags = optional(list(string), []), }))) })", - "default_value": "{ zone-1 = [ { name = \"subnet-a\", cidr = \"10.10.10.0/24\", public_gateway = true, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-2 = [ { name = \"subnet-b\", cidr = \"10.20.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ], zone-3 = [ { name = \"subnet-c\", cidr = \"10.30.10.0/24\", public_gateway = false, acl_name = \"vpc-acl\", no_addr_prefix = false, } ] }", + "type": "object", + "default_value": "{\n zone-1 = [\n {\n name = \"subnet-a\"\n cidr = \"10.10.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-2 = [\n {\n name = \"subnet-b\"\n cidr = \"10.20.10.0/24\"\n public_gateway = false\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-3 = [\n {\n name = \"subnet-c\"\n cidr = \"10.30.10.0/24\"\n public_gateway = false\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ]\n }", "description": "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-).", - "virtual": true, - "custom_config": { - "type": "textarea", - "grouping": "deployment", - "original_grouping": "deployment" - } + "display_name": "subnets3", + "required": false, + "virtual": true }, { "key": "provider_visibility", From 63b8d18b6ba1e896aa320d2d051ee52df515aa1b Mon Sep 17 00:00:00 2001 From: "aashiq.jacob@ibm.com" Date: Wed, 25 Jun 2025 14:55:05 +0530 Subject: [PATCH 11/11] test --- ibm_catalog.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 9832fddd..5d0d70bc 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -730,7 +730,6 @@ "type": "object", "default_value": "{\n zone-1 = [\n {\n name = \"subnet-a\"\n cidr = \"10.10.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-2 = [\n {\n name = \"subnet-b\"\n cidr = \"10.20.10.0/24\"\n public_gateway = false\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-3 = [\n {\n name = \"subnet-c\"\n cidr = \"10.30.10.0/24\"\n public_gateway = false\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ]\n }", "description": "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addressess. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-).", - "display_name": "subnets3", "required": false, "virtual": true },