From 1f4f99e0a8d624132afb0ca27e68535a3a73bd9b Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 11:25:33 +0530 Subject: [PATCH 01/41] feat: enhance boolean field widgets and descriptions for cluster access and outbound traffic --- ibm_catalog.json | 59 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 0eb18547f..82190eefc 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -505,7 +505,19 @@ }, { "key": "allow_public_access_to_cluster_management", - "required": true + "type": "boolean", + "required": true, + "description": "Set to true to access the cluster through a public cloud service endpoint.", + "options": [ + { + "displayname": "Public access allowed (true)", + "value": "true" + }, + { + "displayname": "Private access only (false)", + "value": "false" + } + ] }, { "key": "enable_platform_metrics", @@ -719,7 +731,20 @@ ] }, { - "key": "allow_outbound_traffic" + "key": "allow_outbound_traffic", + "type": "boolean", + "required": true, + "description": "Set to true to allow public outbound access from the cluster workers.", + "options": [ + { + "displayname": "Allow outbound network access (true)", + "value": "true" + }, + { + "displayname": "Restrict outbound network access (false)", + "value": "false" + } + ] }, { "key": "verify_worker_network_readiness", @@ -1553,10 +1578,36 @@ } }, { - "key": "allow_public_access_to_cluster_management" + "key": "allow_public_access_to_cluster_management", + "type": "boolean", + "required": true, + "description": "Set to true to access the cluster through a public cloud service endpoint.", + "options": [ + { + "displayname": "Public access allowed (true)", + "value": "true" + }, + { + "displayname": "Private access only (false)", + "value": "false" + } + ] }, { - "key": "allow_outbound_traffic" + "key": "allow_outbound_traffic", + "type": "boolean", + "required": true, + "description": "Set to true to allow public outbound access from the cluster workers.", + "options": [ + { + "displayname": "Allow outbound network access (true)", + "value": "true" + }, + { + "displayname": "Restrict outbound network access (false)", + "value": "false" + } + ] } ], "dependency_version_2": true, From 013c8cd786ba52aa707fbd1c30f20f8baf9aeb6b Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 11:26:56 +0530 Subject: [PATCH 02/41] fix: change default prefix from 'dev' to 'openshift' for better clarity --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 82190eefc..603a1a96a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1430,7 +1430,7 @@ { "key": "prefix", "required": true, - "default_value": "dev", + "default_value": "openshift", "random_string": { "length": 4 }, From 877caf4143bdbdf778b74bcb7d6153cd474efe47 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 11:30:49 +0530 Subject: [PATCH 03/41] fix: add numeric range validation for default_worker_pool_workers_per_zone and changes prefix to openshift across all flavours --- ibm_catalog.json | 11 +++++++++-- solutions/fully-configurable/variables.tf | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 603a1a96a..f35d2e4a9 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -234,7 +234,7 @@ }, { "key": "prefix", - "default_value": "dev", + "default_value": "openshift", "random_string": { "length": 4 }, @@ -478,7 +478,14 @@ }, { "key": "default_worker_pool_workers_per_zone", - "required": true + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "Worker count per zone must be a positive integer greater than 0.", + "value": "^[1-9][0-9]*$" + } + ] }, { "key": "default_worker_pool_operating_system", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index c5710c9c1..e92c38e46 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -176,8 +176,14 @@ variable "default_worker_pool_workers_per_zone" { type = number description = "Number of worker nodes in each zone of the cluster." default = 1 + + validation { + condition = var.default_worker_pool_workers_per_zone > 0 + error_message = "Worker count per zone must be greater than 0." + } } + variable "default_worker_pool_operating_system" { type = string description = "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)" From a122bce1b2d7575da35303908beac2a33de14e2a Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 11:33:44 +0530 Subject: [PATCH 04/41] fix: clarify Secrets Manager trial usage note in catalog.json --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index f35d2e4a9..820a71490 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -930,8 +930,8 @@ "value": "standard" }, { - "description": "Try Secrets Manager at no cost for 30 days. Unlimited access to all service capabilities for a limited time. You can have one Trial instance provisioned in your account at any time. After your trial expires, functionality is removed.", - "displayname": "Trial", + "description": "Choose this only if your account does not already have a Trial instance. You can have only one Trial instance per account at a time. After your trial expires, you must upgrade to the Standard plan to continue using Secrets Manager.", + "displayname": "Trial (30 days)", "value": "trial" } ] From e0197fe25b68cfef334f44a7be0400e2e41a9c6e Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 11:36:04 +0530 Subject: [PATCH 05/41] fiix: add non-empty validation for existing_resource_group_name input --- ibm_catalog.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 820a71490..8348b80b1 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -571,7 +571,15 @@ "config_constraints": { "identifier": "rg_name" } - } + }, + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "Resource group name cannot be empty.", + "value": "^(?!\\s*$).+" + } + ] }, { "key": "cluster_resource_tags", @@ -1432,7 +1440,15 @@ "config_constraints": { "identifier": "rg_name" } - } + }, + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "Resource group name cannot be empty.", + "value": "^(?!\\s*$).+" + } + ] }, { "key": "prefix", From daa357ab9df115deb21206dcbc805cb0c6252726 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 12:15:59 +0530 Subject: [PATCH 06/41] fix: enable regex validation for default_worker_pool_workers_per_zone with custom_config pattern" --- ibm_catalog.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8348b80b1..34819691c 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -478,14 +478,19 @@ }, { "key": "default_worker_pool_workers_per_zone", + "type": "string", "required": true, - "value_constraints": [ - { - "type": "regex", - "description": "Worker count per zone must be a positive integer greater than 0.", - "value": "^[1-9][0-9]*$" + "default_value": "1", + "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string", + "pattern": "^[1-9][0-9]*$", + "validation_message": "Worker count per zone must be a positive integer greater than 0." } - ] + } }, { "key": "default_worker_pool_operating_system", From c746c17b01eae1791f5e816b9d1227d3dd28ed5f Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 12:24:12 +0530 Subject: [PATCH 07/41] fix: updated regex validation --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 34819691c..eb7d07bb6 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -478,7 +478,7 @@ }, { "key": "default_worker_pool_workers_per_zone", - "type": "string", + "type": "number", "required": true, "default_value": "1", "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", @@ -486,7 +486,7 @@ "grouping": "deployment", "original_grouping": "deployment", "config_constraints": { - "type": "string", + "type": "number", "pattern": "^[1-9][0-9]*$", "validation_message": "Worker count per zone must be a positive integer greater than 0." } From d5ac18648fe4b369860078c2361e182ab337965d Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 12:39:50 +0530 Subject: [PATCH 08/41] fix: updated validation for worker pool zone --- ibm_catalog.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index eb7d07bb6..2301a7e1a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -480,15 +480,15 @@ "key": "default_worker_pool_workers_per_zone", "type": "number", "required": true, - "default_value": "1", + "default_value": 1, "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "custom_config": { "grouping": "deployment", "original_grouping": "deployment", "config_constraints": { "type": "number", - "pattern": "^[1-9][0-9]*$", - "validation_message": "Worker count per zone must be a positive integer greater than 0." + "minimum": 1, + "validation_message": "Worker count per zone must be at least 1." } } }, From e1db53716e4220e298bdf0ec3f333f9ab4cf7e53 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 12:46:12 +0530 Subject: [PATCH 09/41] fix: updated default_worker_pool_workers_per_zone --- ibm_catalog.json | 11 +++++------ solutions/fully-configurable/variables.tf | 7 ++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2301a7e1a..e0023c883 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -478,17 +478,16 @@ }, { "key": "default_worker_pool_workers_per_zone", - "type": "number", + "type": "string", "required": true, - "default_value": 1, + "default_value": "1", "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "custom_config": { "grouping": "deployment", - "original_grouping": "deployment", "config_constraints": { - "type": "number", - "minimum": 1, - "validation_message": "Worker count per zone must be at least 1." + "type": "string", + "pattern": "^[1-9][0-9]*$", + "validation_message": "Worker count per zone must be greater than 0." } } }, diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index e92c38e46..25b2bdcaf 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -173,17 +173,18 @@ variable "default_worker_pool_machine_type" { } variable "default_worker_pool_workers_per_zone" { - type = number + type = string description = "Number of worker nodes in each zone of the cluster." - default = 1 + default = "1" validation { - condition = var.default_worker_pool_workers_per_zone > 0 + condition = tonumber(var.default_worker_pool_workers_per_zone) > 0 error_message = "Worker count per zone must be greater than 0." } } + variable "default_worker_pool_operating_system" { type = string description = "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)" From 5eeb3e79ad1b4151fd0a1d1bf91974f14ec178c7 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 12:49:43 +0530 Subject: [PATCH 10/41] fix: Update validation for worker zone --- ibm_catalog.json | 11 ++++++----- solutions/fully-configurable/variables.tf | 7 +++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index e0023c883..2301a7e1a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -478,16 +478,17 @@ }, { "key": "default_worker_pool_workers_per_zone", - "type": "string", + "type": "number", "required": true, - "default_value": "1", + "default_value": 1, "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "custom_config": { "grouping": "deployment", + "original_grouping": "deployment", "config_constraints": { - "type": "string", - "pattern": "^[1-9][0-9]*$", - "validation_message": "Worker count per zone must be greater than 0." + "type": "number", + "minimum": 1, + "validation_message": "Worker count per zone must be at least 1." } } }, diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 25b2bdcaf..e92c38e46 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -173,18 +173,17 @@ variable "default_worker_pool_machine_type" { } variable "default_worker_pool_workers_per_zone" { - type = string + type = number description = "Number of worker nodes in each zone of the cluster." - default = "1" + default = 1 validation { - condition = tonumber(var.default_worker_pool_workers_per_zone) > 0 + condition = var.default_worker_pool_workers_per_zone > 0 error_message = "Worker count per zone must be greater than 0." } } - variable "default_worker_pool_operating_system" { type = string description = "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)" From 0f0e45017629c93b517143e2ec52ccfd324101fc Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 14:03:33 +0530 Subject: [PATCH 11/41] fix: converted to string to test regex --- ibm_catalog.json | 10 +++++----- solutions/fully-configurable/variables.tf | 9 ++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2301a7e1a..83fdb4500 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -478,17 +478,17 @@ }, { "key": "default_worker_pool_workers_per_zone", - "type": "number", + "type": "string", "required": true, - "default_value": 1, + "default_value": "1", "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "custom_config": { "grouping": "deployment", "original_grouping": "deployment", "config_constraints": { - "type": "number", - "minimum": 1, - "validation_message": "Worker count per zone must be at least 1." + "type": "string", + "pattern": "^[1-9][0-9]*$", + "validation_message": "Worker count per zone must be greater than 0." } } }, diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index e92c38e46..bc2fbf204 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -173,14 +173,9 @@ variable "default_worker_pool_machine_type" { } variable "default_worker_pool_workers_per_zone" { - type = number + type = string description = "Number of worker nodes in each zone of the cluster." - default = 1 - - validation { - condition = var.default_worker_pool_workers_per_zone > 0 - error_message = "Worker count per zone must be greater than 0." - } + default = "1" } From cc02cd06d225037e2c58cf96df02a50d45b66f12 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 14:07:58 +0530 Subject: [PATCH 12/41] fix: updated var to integer --- solutions/fully-configurable/variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index bc2fbf204..0cb704e95 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -173,9 +173,9 @@ variable "default_worker_pool_machine_type" { } variable "default_worker_pool_workers_per_zone" { - type = string + type = number description = "Number of worker nodes in each zone of the cluster." - default = "1" + default = 1 } From 3f56e256c1560f1dfc3e1d2a106cefba2ba84a95 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 14:27:46 +0530 Subject: [PATCH 13/41] fix : updated regex validation for default_worker_pool_workers_per_zone --- ibm_catalog.json | 19 ++++++++----------- solutions/fully-configurable/variables.tf | 1 - 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 83fdb4500..6d1f28fdd 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -482,15 +482,13 @@ "required": true, "default_value": "1", "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", - "custom_config": { - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "type": "string", - "pattern": "^[1-9][0-9]*$", - "validation_message": "Worker count per zone must be greater than 0." - } - } + "value_constraints": [ + { + "type": "regex", + "description": "Worker count per zone must be greater than 0.", + "value": "^[1-9][0-9]*$" + } + ] }, { "key": "default_worker_pool_operating_system", @@ -577,7 +575,6 @@ "identifier": "rg_name" } }, - "required": true, "value_constraints": [ { "type": "regex", @@ -1435,6 +1432,7 @@ { "key": "ibmcloud_api_key" }, + { "key": "existing_resource_group_name", "display_name": "resource_group", @@ -1446,7 +1444,6 @@ "identifier": "rg_name" } }, - "required": true, "value_constraints": [ { "type": "regex", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 0cb704e95..c5710c9c1 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -178,7 +178,6 @@ variable "default_worker_pool_workers_per_zone" { default = 1 } - variable "default_worker_pool_operating_system" { type = string description = "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)" From f1b197f5811ee2b8dc6ec7705aa432c577d051ad Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 14:46:56 +0530 Subject: [PATCH 14/41] fix : updated resource group validation --- ibm_catalog.json | 19 ++++--------------- solutions/fully-configurable/variables.tf | 8 +++++++- solutions/quickstart/variables.tf | 7 ++++++- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 6d1f28fdd..a1fb411c2 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -567,6 +567,7 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", + "default_value": "Default", "custom_config": { "type": "resource_group", "grouping": "deployment", @@ -575,13 +576,7 @@ "identifier": "rg_name" } }, - "value_constraints": [ - { - "type": "regex", - "description": "Resource group name cannot be empty.", - "value": "^(?!\\s*$).+" - } - ] + "description": "Select the resource group to use. The default is 'Default'. This field cannot be empty." }, { "key": "cluster_resource_tags", @@ -1432,10 +1427,10 @@ { "key": "ibmcloud_api_key" }, - { "key": "existing_resource_group_name", "display_name": "resource_group", + "default_value": "Default", "custom_config": { "type": "resource_group", "grouping": "deployment", @@ -1444,13 +1439,7 @@ "identifier": "rg_name" } }, - "value_constraints": [ - { - "type": "regex", - "description": "Resource group name cannot be empty.", - "value": "^(?!\\s*$).+" - } - ] + "description": "Select the resource group to use. The default is 'Default'. This field cannot be empty." }, { "key": "prefix", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index c5710c9c1..c7e566de6 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -41,10 +41,16 @@ variable "prefix" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." + description = "The name of an existing resource group to provision the resources. Cannot be empty. Defaults to 'Default'." default = "Default" + + validation { + condition = length(trimspace(var.existing_resource_group_name)) > 0 + error_message = "Resource group name cannot be empty or whitespace." + } } + variable "cluster_resource_tags" { type = list(string) description = "Metadata labels describing this cluster deployment, i.e. test." diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index c945da62a..a1a948342 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -7,8 +7,13 @@ variable "ibmcloud_api_key" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." + description = "The name of an existing resource group to provision the resources. Cannot be empty. Defaults to 'Default'." default = "Default" + + validation { + condition = length(trimspace(var.existing_resource_group_name)) > 0 + error_message = "Resource group name cannot be empty or whitespace." + } } variable "provider_visibility" { From f23afaa42b9e75111ffde9ca4e8eef14458c147c Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 14:49:51 +0530 Subject: [PATCH 15/41] updated --- ibm_catalog.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index a1fb411c2..29bab2ae0 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -483,11 +483,11 @@ "default_value": "1", "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "value_constraints": [ - { - "type": "regex", - "description": "Worker count per zone must be greater than 0.", - "value": "^[1-9][0-9]*$" - } + { + "type": "regex", + "description": "Worker count per zone must be greater than 0.", + "value": "^[1-9][0-9]*$" + } ] }, { From d3fa824bbc1c19915fa5b1e396da895c2e81ba1c Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 14:56:53 +0530 Subject: [PATCH 16/41] fix : updated resource group validation --- solutions/fully-configurable/variables.tf | 7 ++++--- solutions/quickstart/variables.tf | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index c7e566de6..a388dcf1d 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -41,16 +41,17 @@ variable "prefix" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. Cannot be empty. Defaults to 'Default'." + description = "The name of an existing resource group. Defaults to 'Default'. Cannot be empty or null." default = "Default" validation { - condition = length(trimspace(var.existing_resource_group_name)) > 0 - error_message = "Resource group name cannot be empty or whitespace." + condition = var.existing_resource_group_name != null && length(trimspace(var.existing_resource_group_name)) > 0 + error_message = "Resource group name cannot be empty, null, or whitespace." } } + variable "cluster_resource_tags" { type = list(string) description = "Metadata labels describing this cluster deployment, i.e. test." diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index a1a948342..ac6302a0a 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -7,12 +7,12 @@ variable "ibmcloud_api_key" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. Cannot be empty. Defaults to 'Default'." + description = "The name of an existing resource group. Defaults to 'Default'. Cannot be empty or null." default = "Default" validation { - condition = length(trimspace(var.existing_resource_group_name)) > 0 - error_message = "Resource group name cannot be empty or whitespace." + condition = var.existing_resource_group_name != null && length(trimspace(var.existing_resource_group_name)) > 0 + error_message = "Resource group name cannot be empty, null, or whitespace." } } From c5b7d1743b5dde4de145f4869a90f7ae4dac7454 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 15:04:28 +0530 Subject: [PATCH 17/41] fix : Updated widget --- ibm_catalog.json | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 29bab2ae0..8de39c0bb 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -515,16 +515,21 @@ }, { "key": "allow_public_access_to_cluster_management", + "type_metadata": "boolean", "type": "boolean", + "default_value": "true", + "virtual": true, "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { - "displayname": "Public access allowed (true)", + "description": "Public access allowed (true)", + "displayname": "true", "value": "true" }, { - "displayname": "Private access only (false)", + "description": "Private access only (false)", + "displayname": "false", "value": "false" } ] @@ -744,16 +749,21 @@ }, { "key": "allow_outbound_traffic", - "type": "boolean", + "type_metadata": "boolean", "required": true, + "type": "boolean", + "virtual": true, + "default_value": "true", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ { - "displayname": "Allow outbound network access (true)", + "description": "Allow outbound network access", + "displayname": "true", "value": "true" }, { - "displayname": "Restrict outbound network access (false)", + "description": "Restrict outbound network access", + "displayname": "false", "value": "false" } ] @@ -1593,32 +1603,42 @@ }, { "key": "allow_public_access_to_cluster_management", + "type_metadata": "boolean", "type": "boolean", + "default_value": "true", + "virtual": true, "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { - "displayname": "Public access allowed (true)", + "description": "Public access allowed (true)", + "displayname": "true", "value": "true" }, { - "displayname": "Private access only (false)", + "description": "Private access only (false)", + "displayname": "false", "value": "false" } ] }, { "key": "allow_outbound_traffic", - "type": "boolean", + "type_metadata": "boolean", "required": true, + "type": "boolean", + "virtual": true, + "default_value": "true", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ { - "displayname": "Allow outbound network access (true)", + "description": "Allow outbound network access", + "displayname": "true", "value": "true" }, { - "displayname": "Restrict outbound network access (false)", + "description": "Restrict outbound network access", + "displayname": "false", "value": "false" } ] From e7d75f6cb1e17229f96dc649830cfcd0251d0ba0 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 15:16:33 +0530 Subject: [PATCH 18/41] fix : Updated widgets --- ibm_catalog.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8de39c0bb..abfe31aea 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -749,10 +749,8 @@ }, { "key": "allow_outbound_traffic", - "type_metadata": "boolean", "required": true, "type": "boolean", - "virtual": true, "default_value": "true", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ @@ -1624,10 +1622,8 @@ }, { "key": "allow_outbound_traffic", - "type_metadata": "boolean", "required": true, "type": "boolean", - "virtual": true, "default_value": "true", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ From 9f2b9b7f70d411a1080051fe599b24874e6873e2 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 15:17:45 +0530 Subject: [PATCH 19/41] fix : updated widgets --- ibm_catalog.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index abfe31aea..3268b8f83 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -515,20 +515,18 @@ }, { "key": "allow_public_access_to_cluster_management", - "type_metadata": "boolean", "type": "boolean", "default_value": "true", - "virtual": true, "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { - "description": "Public access allowed (true)", + "description": "Public access allowed", "displayname": "true", "value": "true" }, { - "description": "Private access only (false)", + "description": "Private access only", "displayname": "false", "value": "false" } @@ -1601,20 +1599,18 @@ }, { "key": "allow_public_access_to_cluster_management", - "type_metadata": "boolean", "type": "boolean", "default_value": "true", - "virtual": true, "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { - "description": "Public access allowed (true)", + "description": "Public access allowed", "displayname": "true", "value": "true" }, { - "description": "Private access only (false)", + "description": "Private access only", "displayname": "false", "value": "false" } From 4b21fb3aa3f2bfa92b28dc23d9fe592283b45d2a Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 15:19:24 +0530 Subject: [PATCH 20/41] fix widgets --- ibm_catalog.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 3268b8f83..2874d290f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -516,7 +516,6 @@ { "key": "allow_public_access_to_cluster_management", "type": "boolean", - "default_value": "true", "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ @@ -749,7 +748,6 @@ "key": "allow_outbound_traffic", "required": true, "type": "boolean", - "default_value": "true", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ { @@ -1600,7 +1598,6 @@ { "key": "allow_public_access_to_cluster_management", "type": "boolean", - "default_value": "true", "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ @@ -1620,7 +1617,6 @@ "key": "allow_outbound_traffic", "required": true, "type": "boolean", - "default_value": "true", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ { From 7a7824e4353d360579f30b43db411f02e63bd977 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 15:53:15 +0530 Subject: [PATCH 21/41] fix : updated resource group validation --- ibm_catalog.json | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2874d290f..cd9cced3f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -569,16 +569,26 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", + "type": "string", "default_value": "Default", + "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", "custom_config": { "type": "resource_group", "grouping": "deployment", "original_grouping": "deployment", "config_constraints": { - "identifier": "rg_name" + "identifier": "rg_name", + "pattern": "^(?!\\s*$).+", + "validation_message": "Resource group name cannot be empty." } }, - "description": "Select the resource group to use. The default is 'Default'. This field cannot be empty." + "value_constraints": [ + { + "type": "regex", + "description": "Resource group name cannot be empty.", + "value": "^(?!\\s*$).+" + } + ] }, { "key": "cluster_resource_tags", @@ -1434,16 +1444,26 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", + "type": "string", "default_value": "Default", + "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", "custom_config": { "type": "resource_group", "grouping": "deployment", "original_grouping": "deployment", "config_constraints": { - "identifier": "rg_name" + "identifier": "rg_name", + "pattern": "^(?!\\s*$).+", + "validation_message": "Resource group name cannot be empty." } }, - "description": "Select the resource group to use. The default is 'Default'. This field cannot be empty." + "value_constraints": [ + { + "type": "regex", + "description": "Resource group name cannot be empty.", + "value": "^(?!\\s*$).+" + } + ] }, { "key": "prefix", From df5be862545ac9a4a44e6b419e07a30d7cfa4e88 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 15:56:49 +0530 Subject: [PATCH 22/41] fix: updated resource group validation --- ibm_catalog.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index cd9cced3f..78f2d3080 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -572,16 +572,6 @@ "type": "string", "default_value": "Default", "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", - "custom_config": { - "type": "resource_group", - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "identifier": "rg_name", - "pattern": "^(?!\\s*$).+", - "validation_message": "Resource group name cannot be empty." - } - }, "value_constraints": [ { "type": "regex", @@ -1447,16 +1437,6 @@ "type": "string", "default_value": "Default", "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", - "custom_config": { - "type": "resource_group", - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "identifier": "rg_name", - "pattern": "^(?!\\s*$).+", - "validation_message": "Resource group name cannot be empty." - } - }, "value_constraints": [ { "type": "regex", From b0da67a1495095911c816413e88f2afc55a5b5b5 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 16:19:43 +0530 Subject: [PATCH 23/41] fix: updated resource groupvalidation --- ibm_catalog.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ibm_catalog.json b/ibm_catalog.json index 78f2d3080..e9bac04ee 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -572,6 +572,13 @@ "type": "string", "default_value": "Default", "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", + "custom_config": { + "type": "string_input", + "config_constraints": { + "pattern": "^(?!\\s*$).+", + "validation_message": "Resource group name cannot be empty." + } + }, "value_constraints": [ { "type": "regex", @@ -1437,6 +1444,13 @@ "type": "string", "default_value": "Default", "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", + "custom_config": { + "type": "string_input", + "config_constraints": { + "pattern": "^(?!\\s*$).+", + "validation_message": "Resource group name cannot be empty." + } + }, "value_constraints": [ { "type": "regex", From 3a71b381c9bf037782cf141a9deb838c1dcd7e5c Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Fri, 7 Nov 2025 16:40:32 +0530 Subject: [PATCH 24/41] fix : updated regex for resource group validation and widgets --- ibm_catalog.json | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index e9bac04ee..8127db43b 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -569,14 +569,13 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", - "type": "string", - "default_value": "Default", "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", "custom_config": { - "type": "string_input", + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", "config_constraints": { - "pattern": "^(?!\\s*$).+", - "validation_message": "Resource group name cannot be empty." + "identifier": "rg_name" } }, "value_constraints": [ @@ -753,7 +752,6 @@ }, { "key": "allow_outbound_traffic", - "required": true, "type": "boolean", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ @@ -1441,14 +1439,13 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", - "type": "string", - "default_value": "Default", "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", "custom_config": { - "type": "string_input", + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", "config_constraints": { - "pattern": "^(?!\\s*$).+", - "validation_message": "Resource group name cannot be empty." + "identifier": "rg_name" } }, "value_constraints": [ @@ -1612,7 +1609,6 @@ { "key": "allow_public_access_to_cluster_management", "type": "boolean", - "required": true, "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { @@ -1629,7 +1625,6 @@ }, { "key": "allow_outbound_traffic", - "required": true, "type": "boolean", "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ From bf61386e20950dbfcaceca750084860f547f252d Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Mon, 10 Nov 2025 10:23:42 +0530 Subject: [PATCH 25/41] fix : Addressed the comments --- ibm_catalog.json | 33 +++-------------------- solutions/fully-configurable/variables.tf | 8 ++---- solutions/quickstart/variables.tf | 8 ++---- 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8127db43b..67a9ddbf5 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -234,7 +234,7 @@ }, { "key": "prefix", - "default_value": "openshift", + "default_value": "dev", "random_string": { "length": 4 }, @@ -480,7 +480,6 @@ "key": "default_worker_pool_workers_per_zone", "type": "string", "required": true, - "default_value": "1", "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "value_constraints": [ { @@ -515,9 +514,7 @@ }, { "key": "allow_public_access_to_cluster_management", - "type": "boolean", "required": true, - "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { "description": "Public access allowed", @@ -569,7 +566,6 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", - "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", "custom_config": { "type": "resource_group", "grouping": "deployment", @@ -577,14 +573,7 @@ "config_constraints": { "identifier": "rg_name" } - }, - "value_constraints": [ - { - "type": "regex", - "description": "Resource group name cannot be empty.", - "value": "^(?!\\s*$).+" - } - ] + } }, { "key": "cluster_resource_tags", @@ -752,8 +741,6 @@ }, { "key": "allow_outbound_traffic", - "type": "boolean", - "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ { "description": "Allow outbound network access", @@ -1439,7 +1426,6 @@ { "key": "existing_resource_group_name", "display_name": "resource_group", - "description": "Select or provide an existing IBM Cloud resource group. This value cannot be empty.", "custom_config": { "type": "resource_group", "grouping": "deployment", @@ -1447,19 +1433,12 @@ "config_constraints": { "identifier": "rg_name" } - }, - "value_constraints": [ - { - "type": "regex", - "description": "Resource group name cannot be empty.", - "value": "^(?!\\s*$).+" - } - ] + } }, { "key": "prefix", "required": true, - "default_value": "openshift", + "default_value": "dev", "random_string": { "length": 4 }, @@ -1608,8 +1587,6 @@ }, { "key": "allow_public_access_to_cluster_management", - "type": "boolean", - "description": "Set to true to access the cluster through a public cloud service endpoint.", "options": [ { "description": "Public access allowed", @@ -1625,8 +1602,6 @@ }, { "key": "allow_outbound_traffic", - "type": "boolean", - "description": "Set to true to allow public outbound access from the cluster workers.", "options": [ { "description": "Allow outbound network access", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index a388dcf1d..e7f37b731 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -41,13 +41,9 @@ variable "prefix" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group. Defaults to 'Default'. Cannot be empty or null." + description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." default = "Default" - - validation { - condition = var.existing_resource_group_name != null && length(trimspace(var.existing_resource_group_name)) > 0 - error_message = "Resource group name cannot be empty, null, or whitespace." - } + nullable = false } diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index ac6302a0a..06f4f33d2 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -7,13 +7,9 @@ variable "ibmcloud_api_key" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group. Defaults to 'Default'. Cannot be empty or null." + description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." default = "Default" - - validation { - condition = var.existing_resource_group_name != null && length(trimspace(var.existing_resource_group_name)) > 0 - error_message = "Resource group name cannot be empty, null, or whitespace." - } + nullable = false } variable "provider_visibility" { From 6c56ca9d0992d029f219b24acc22ffca2c018846 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Mon, 10 Nov 2025 10:35:59 +0530 Subject: [PATCH 26/41] fix : Addressed the comments --- ibm_catalog.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 67a9ddbf5..48faccff5 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -480,7 +480,6 @@ "key": "default_worker_pool_workers_per_zone", "type": "string", "required": true, - "description": "Number of worker nodes per zone. Must be a positive integer greater than 0.", "value_constraints": [ { "type": "regex", From a5d29dba77bb7ee5050ff007ccb1313caec24842 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Mon, 10 Nov 2025 14:01:08 +0530 Subject: [PATCH 27/41] fix : added default value to test --- ibm_catalog.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ibm_catalog.json b/ibm_catalog.json index 48faccff5..1bb2e1d05 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -479,6 +479,7 @@ { "key": "default_worker_pool_workers_per_zone", "type": "string", + "default_value": "1", "required": true, "value_constraints": [ { From 45fcbb95600d1f76285c2d635f5897ba642e5d88 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Mon, 10 Nov 2025 14:11:54 +0530 Subject: [PATCH 28/41] fix : testing resource group validation --- solutions/fully-configurable/variables.tf | 1 - solutions/quickstart/variables.tf | 1 - 2 files changed, 2 deletions(-) diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index e7f37b731..9b8fafdbc 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -43,7 +43,6 @@ variable "existing_resource_group_name" { type = string description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." default = "Default" - nullable = false } diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index 06f4f33d2..c945da62a 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -9,7 +9,6 @@ variable "existing_resource_group_name" { type = string description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." default = "Default" - nullable = false } variable "provider_visibility" { From e40718c5ddcb5d5544f7365755e90eb7d27aa66c Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Mon, 10 Nov 2025 16:13:58 +0530 Subject: [PATCH 29/41] fix : updated the prefix --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1bb2e1d05..eb1983d49 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -234,7 +234,7 @@ }, { "key": "prefix", - "default_value": "dev", + "default_value": "ocp", "random_string": { "length": 4 }, @@ -1438,7 +1438,7 @@ { "key": "prefix", "required": true, - "default_value": "dev", + "default_value": "ocp", "random_string": { "length": 4 }, From a63626f97df0646ff199d455d38b5126c77f349a Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Mon, 10 Nov 2025 16:36:05 +0530 Subject: [PATCH 30/41] fix : update widgets description --- ibm_catalog.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index eb1983d49..539dc8b45 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -517,13 +517,13 @@ "required": true, "options": [ { - "description": "Public access allowed", - "displayname": "true", + "description": "Allow public access to the cluster management endpoint.", + "displayname": "True", "value": "true" }, { - "description": "Private access only", - "displayname": "false", + "description": "Restrict access to private network only.", + "displayname": "False", "value": "false" } ] @@ -743,13 +743,13 @@ "key": "allow_outbound_traffic", "options": [ { - "description": "Allow outbound network access", - "displayname": "true", + "description": "worker nodes can send outbound traffic to the internet.", + "displayname": "True", "value": "true" }, { - "description": "Restrict outbound network access", - "displayname": "false", + "description": "Restrict outbound traffic to private or VPC-local networks.", + "displayname": "False", "value": "false" } ] @@ -1589,13 +1589,13 @@ "key": "allow_public_access_to_cluster_management", "options": [ { - "description": "Public access allowed", - "displayname": "true", + "description": "Allow public access to the cluster management endpoint.", + "displayname": "True", "value": "true" }, { - "description": "Private access only", - "displayname": "false", + "description": "Restrict access to private network only.", + "displayname": "False", "value": "false" } ] @@ -1604,13 +1604,13 @@ "key": "allow_outbound_traffic", "options": [ { - "description": "Allow outbound network access", - "displayname": "true", + "description": "worker nodes can send outbound traffic to the internet.", + "displayname": "True", "value": "true" }, { - "description": "Restrict outbound network access", - "displayname": "false", + "description": "Restrict outbound traffic to private or VPC-local networks.", + "displayname": "False", "value": "false" } ] From 8f4376c989a353e7516105ed63b43d5398fc486b Mon Sep 17 00:00:00 2001 From: Harika <86517031+HarikaPonna@users.noreply.github.com> Date: Tue, 11 Nov 2025 11:09:48 +0530 Subject: [PATCH 31/41] Update ibm_catalog.json Co-authored-by: Shikha Maheshwari --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 539dc8b45..1312658ce 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -931,7 +931,7 @@ "value": "standard" }, { - "description": "Choose this only if your account does not already have a Trial instance. You can have only one Trial instance per account at a time. After your trial expires, you must upgrade to the Standard plan to continue using Secrets Manager.", + "description": "Choose this option only if your account does not already have a Trial plan instance. Only one Trial plan instance is allowed per account. After it expires, upgrade to the Standard plan to keep using Secrets Manager.", "displayname": "Trial (30 days)", "value": "trial" } From 5117df12c57821c89d8e81132aaf97cb6ec633ad Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Tue, 11 Nov 2025 11:17:40 +0530 Subject: [PATCH 32/41] fix : updated description --- ibm_catalog.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 539dc8b45..1ecdbabbd 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -517,7 +517,7 @@ "required": true, "options": [ { - "description": "Allow public access to the cluster management endpoint.", + "description": "Allow access to the cluster management through a public endpoint.", "displayname": "True", "value": "true" }, @@ -743,12 +743,12 @@ "key": "allow_outbound_traffic", "options": [ { - "description": "worker nodes can send outbound traffic to the internet.", + "description": "All outbound traffic from the cluster is permitted with no restrictions applied.", "displayname": "True", "value": "true" }, { - "description": "Restrict outbound traffic to private or VPC-local networks.", + "description": "Allows only essential outbound traffic for cluster functionality; blocks all other access.", "displayname": "False", "value": "false" } @@ -931,7 +931,7 @@ "value": "standard" }, { - "description": "Choose this only if your account does not already have a Trial instance. You can have only one Trial instance per account at a time. After your trial expires, you must upgrade to the Standard plan to continue using Secrets Manager.", + "description": "Choose this option only if your account does not already have a Trial plan instance. Only one Trial plan instance is allowed per account. After it expires, upgrade to the Standard plan to keep using Secrets Manager.", "displayname": "Trial (30 days)", "value": "trial" } @@ -1589,7 +1589,7 @@ "key": "allow_public_access_to_cluster_management", "options": [ { - "description": "Allow public access to the cluster management endpoint.", + "description": "Allow access to the cluster management through a public endpoint.", "displayname": "True", "value": "true" }, @@ -1604,12 +1604,12 @@ "key": "allow_outbound_traffic", "options": [ { - "description": "worker nodes can send outbound traffic to the internet.", + "description": "All outbound traffic from the cluster is permitted with no restrictions applied.", "displayname": "True", "value": "true" }, { - "description": "Restrict outbound traffic to private or VPC-local networks.", + "description": "Allows only essential outbound traffic for cluster functionality; blocks all other access.", "displayname": "False", "value": "false" } From 139e6f885b56a238b9da1f865fb718d358d31240 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Tue, 11 Nov 2025 11:20:21 +0530 Subject: [PATCH 33/41] fix: update description --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1ecdbabbd..7c5b3f684 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -931,7 +931,7 @@ "value": "standard" }, { - "description": "Choose this option only if your account does not already have a Trial plan instance. Only one Trial plan instance is allowed per account. After it expires, upgrade to the Standard plan to keep using Secrets Manager.", + "description": "Choose this option only if your account does not already have a Trial plan instance. Only one Trial plan instance is allowed per account. After it expires, upgrade to the Standard plan to keep using Secrets Manager", "displayname": "Trial (30 days)", "value": "trial" } From b9de3ede61da055f402b0f4e2f06bc1a3a421c8d Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Tue, 11 Nov 2025 11:20:52 +0530 Subject: [PATCH 34/41] fix : added "." at end of description --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 7c5b3f684..1ecdbabbd 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -931,7 +931,7 @@ "value": "standard" }, { - "description": "Choose this option only if your account does not already have a Trial plan instance. Only one Trial plan instance is allowed per account. After it expires, upgrade to the Standard plan to keep using Secrets Manager", + "description": "Choose this option only if your account does not already have a Trial plan instance. Only one Trial plan instance is allowed per account. After it expires, upgrade to the Standard plan to keep using Secrets Manager.", "displayname": "Trial (30 days)", "value": "trial" } From d59bf94aa9400e2c2f6506b212912062af1d7559 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Tue, 11 Nov 2025 11:30:00 +0530 Subject: [PATCH 35/41] fix: Updated cluster_name from "openshift" to "cluster" --- solutions/fully-configurable/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 9b8fafdbc..036eca08e 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -66,7 +66,7 @@ variable "access_tags" { variable "cluster_name" { type = string description = "The name of the new IBM Cloud OpenShift Cluster. If a `prefix` input variable is specified, it is added to this name in the `-value` format." - default = "openshift" + default = "cluster" } variable "openshift_version" { From 7a6c840250c0e089df99bea9ba7d5baba1c30d25 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Tue, 11 Nov 2025 11:43:54 +0530 Subject: [PATCH 36/41] fix : updated cluster name from "openshit-qs "to "cluster" --- solutions/quickstart/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index c945da62a..f19de7d01 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -56,7 +56,7 @@ variable "openshift_version" { variable "cluster_name" { type = string description = "The name of the new IBM Cloud OpenShift Cluster. If a `prefix` input variable is specified, it is added to this name in the `-value` format." - default = "openshift-qs" + default = "cluster" } From 273811bf30c91887d98f0b6c9aa8875565074f32 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Tue, 11 Nov 2025 19:32:17 +0530 Subject: [PATCH 37/41] fix: testing with type "boolean" --- ibm_catalog.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1ecdbabbd..e42489b66 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -514,6 +514,7 @@ }, { "key": "allow_public_access_to_cluster_management", + "type": "boolean", "required": true, "options": [ { @@ -741,6 +742,7 @@ }, { "key": "allow_outbound_traffic", + "type": "boolean", "options": [ { "description": "All outbound traffic from the cluster is permitted with no restrictions applied.", @@ -1587,6 +1589,7 @@ }, { "key": "allow_public_access_to_cluster_management", + "type": "boolean", "options": [ { "description": "Allow access to the cluster management through a public endpoint.", @@ -1602,6 +1605,7 @@ }, { "key": "allow_outbound_traffic", + "type": "boolean", "options": [ { "description": "All outbound traffic from the cluster is permitted with no restrictions applied.", From 4bf4a9815b99968e246f37aed264b4469cf5db7b Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Wed, 12 Nov 2025 10:35:11 +0530 Subject: [PATCH 38/41] fix : updated description --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index e42489b66..9ec4bcbbe 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -745,7 +745,7 @@ "type": "boolean", "options": [ { - "description": "All outbound traffic from the cluster is permitted with no restrictions applied.", + "description": "Allows all outbound traffic from the cluster with no restrictions applied.", "displayname": "True", "value": "true" }, @@ -1608,7 +1608,7 @@ "type": "boolean", "options": [ { - "description": "All outbound traffic from the cluster is permitted with no restrictions applied.", + "description": "Allows all outbound traffic from the cluster with no restrictions applied.", "displayname": "True", "value": "true" }, From cf6189881a1be1c9681efc0c5cf5ec9953fcd925 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Wed, 12 Nov 2025 10:49:34 +0530 Subject: [PATCH 39/41] fix : updated the option values from string to boolean --- ibm_catalog.json | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 9ec4bcbbe..08b435ac8 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -514,18 +514,17 @@ }, { "key": "allow_public_access_to_cluster_management", - "type": "boolean", "required": true, "options": [ { "description": "Allow access to the cluster management through a public endpoint.", "displayname": "True", - "value": "true" + "value": true }, { "description": "Restrict access to private network only.", "displayname": "False", - "value": "false" + "value": false } ] }, @@ -742,17 +741,16 @@ }, { "key": "allow_outbound_traffic", - "type": "boolean", "options": [ { "description": "Allows all outbound traffic from the cluster with no restrictions applied.", "displayname": "True", - "value": "true" + "value": true }, { "description": "Allows only essential outbound traffic for cluster functionality; blocks all other access.", "displayname": "False", - "value": "false" + "value": false } ] }, @@ -1589,33 +1587,31 @@ }, { "key": "allow_public_access_to_cluster_management", - "type": "boolean", "options": [ { "description": "Allow access to the cluster management through a public endpoint.", "displayname": "True", - "value": "true" + "value": true }, { "description": "Restrict access to private network only.", "displayname": "False", - "value": "false" + "value": false } ] }, { "key": "allow_outbound_traffic", - "type": "boolean", "options": [ { "description": "Allows all outbound traffic from the cluster with no restrictions applied.", "displayname": "True", - "value": "true" + "value": true }, { "description": "Allows only essential outbound traffic for cluster functionality; blocks all other access.", "displayname": "False", - "value": "false" + "value": false } ] } From 9ed4c32b5ab88c25bbe458520b7f421d5d3c3157 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Wed, 12 Nov 2025 14:28:12 +0530 Subject: [PATCH 40/41] fix : removed unwanted spaces --- solutions/fully-configurable/variables.tf | 3 --- solutions/quickstart/variables.tf | 2 -- 2 files changed, 5 deletions(-) diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 036eca08e..d55a7115b 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -38,15 +38,12 @@ variable "prefix" { } } - variable "existing_resource_group_name" { type = string description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." default = "Default" } - - variable "cluster_resource_tags" { type = list(string) description = "Metadata labels describing this cluster deployment, i.e. test." diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index f19de7d01..0b23ee27e 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -59,7 +59,6 @@ variable "cluster_name" { default = "cluster" } - variable "address_prefix" { description = "The IP range that defines a certain location for the VPC. Use only with manual address prefixes." type = string @@ -72,7 +71,6 @@ variable "ocp_entitlement" { default = null } - variable "default_worker_pool_operating_system" { type = string description = "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)." From 3c19223497e7b61f1bc5ba2659cbe2f63cef4c50 Mon Sep 17 00:00:00 2001 From: Harika-Ponna Date: Thu, 13 Nov 2025 10:27:37 +0530 Subject: [PATCH 41/41] SKIP UPGRADE TEST