From f8743aeaaad91f7f463f94c45b24af8b3b7b9919 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Wed, 29 Oct 2025 18:29:36 +0530 Subject: [PATCH 1/5] added the worker node flavour widget --- common-dev-assets | 2 +- ibm_catalog.json | 218 +++++----------------------------------------- 2 files changed, 23 insertions(+), 197 deletions(-) diff --git a/common-dev-assets b/common-dev-assets index ae23e021..3cfd2b62 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit ae23e021950779a9c0612e71ce51d074f14b7543 +Subproject commit 3cfd2b622d864175e7979de6885a65b4fb4ab6db diff --git a/ibm_catalog.json b/ibm_catalog.json index 30a1a7d4..2c56b054 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -76,6 +76,15 @@ "install_type": "fullstack", "working_directory": "solutions/fully-configurable", "release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes", + "compliance": { + "authority": "scc-v3", + "profiles": [ + { + "profile_name": "IBM Cloud Framework for Financial Services", + "profile_version": "1.7.0" + } + ] + }, "iam_permissions": [ { "role_crns": [ @@ -257,12 +266,8 @@ { "key": "openshift_version", "required": true, - "default_value": "4.19", + "default_value": "4.18", "options": [ - { - "displayname": "4.19", - "value": "4.19" - }, { "displayname": "4.18", "value": "4.18" @@ -287,189 +292,16 @@ }, { "key": "default_worker_pool_machine_type", + "type": "string", + "default_value": "", + "description": "a worker node flavor", "required": true, - "options": [ - { - "displayname": "bx2.4x16", - "value": "bx2.4x16" - }, - { - "displayname": "bx2.16x64", - "value": "bx2.16x64" - }, - { - "displayname": "bx2.32x128", - "value": "bx2.32x128" - }, - { - "displayname": "bx2.48x192", - "value": "bx2.48x192" - }, - { - "displayname": "bx2.8x32", - "value": "bx2.8x32" - }, - { - "displayname": "bx3d.128x640", - "value": "bx3d.128x640" - }, - { - "displayname": "bx3d.16x80", - "value": "bx3d.16x80" - }, - { - "displayname": "bx3d.24x120", - "value": "bx3d.24x120" - }, - { - "displayname": "bx3d.32x160", - "value": "bx3d.32x160" - }, - { - "displayname": "bx3d.48x240", - "value": "bx3d.48x240" - }, - { - "displayname": "bx3d.64x320", - "value": "bx3d.64x320" - }, - { - "displayname": "bx3d.8x40", - "value": "bx3d.8x40" - }, - { - "displayname": "bx3d.96x480", - "value": "bx3d.96x480" - }, - { - "displayname": "cx2.16x32", - "value": "cx2.16x32" - }, - { - "displayname": "cx2.32x64", - "value": "cx2.32x64" - }, - { - "displayname": "cx2.48x96", - "value": "cx2.48x96" - }, - { - "displayname": "cx3d.128x320", - "value": "cx3d.128x320" - }, - { - "displayname": "cx3d.16x40", - "value": "cx3d.16x40" - }, - { - "displayname": "cx3d.24x60", - "value": "cx3d.24x60" - }, - { - "displayname": "cx3d.32x80", - "value": "cx3d.32x80" - }, - { - "displayname": "cx3d.48x120", - "value": "cx3d.48x120" - }, - { - "displayname": "cx3d.64x160", - "value": "cx3d.64x160" - }, - { - "displayname": "cx3d.96x240", - "value": "cx3d.96x240" - }, - { - "displayname": "mx2.128x1024", - "value": "mx2.128x1024" - }, - { - "displayname": "mx2.16x128", - "value": "mx2.16x128" - }, - { - "displayname": "mx2.32x256", - "value": "mx2.32x256" - }, - { - "displayname": "mx2.48x384", - "value": "mx2.48x384" - }, - { - "displayname": "mx2.64x512", - "value": "mx2.64x512" - }, - { - "displayname": "mx2.8x64", - "value": "mx2.8x64" - }, - { - "displayname": "mx3d.128x1280", - "value": "mx3d.128x1280" - }, - { - "displayname": "mx3d.24x240", - "value": "mx3d.24x240" - }, - { - "displayname": "mx3d.32x320", - "value": "mx3d.32x320" - }, - { - "displayname": "mx3d.48x480", - "value": "mx3d.48x480" - }, - { - "displayname": "mx3d.64x640", - "value": "mx3d.64x640" - }, - { - "displayname": "mx3d.96x960", - "value": "mx3d.96x960" - }, - { - "displayname": "bx2d.metal.96x384 (Only available in Toronto (ca-tor))", - "value": "bx2d.metal.96x384" - }, - { - "displayname": "cx2d.metal.96x192 (Only available in Toronto (ca-tor)) ", - "value": "cx2d.metal.96x192" - }, - { - "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))", - "value": "mx2.16x128.2000gb" - }, - { - "displayname": "ox2.128x1024 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))", - "value": "ox2.128x1024" - }, - { - "displayname": "ox2.16x128 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))", - "value": "ox2.16x128" - }, - { - "displayname": "ox2.32x256 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))", - "value": "ox2.32x256" - }, - { - "displayname": "ox2.64x512 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))", - "value": "ox2.64x512" - }, - { - "displayname": "ox2.8x64 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))", - "value": "ox2.8x64" - }, - { - "displayname": "ox2.96x768 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))", - "value": "ox2.96x768" - } - ] + "custom_config": { + "type": "worker_node_flavors", + "grouping": "deployment", + "original_grouping": "deployment" + }, + "virtual": false }, { "key": "default_worker_pool_workers_per_zone", @@ -1310,8 +1142,7 @@ } ], "dependency_version_2": true, - "terraform_version": "1.10.5", - "ignore_readme": true + "terraform_version": "1.10.5" }, { "label": "QuickStart - Basic and simple", @@ -1471,13 +1302,9 @@ }, { "key": "openshift_version", - "default_value": "4.19", + "default_value": "4.18", "required": true, "options": [ - { - "displayname": "4.19", - "value": "4.19" - }, { "displayname": "4.18", "value": "4.18" @@ -1548,8 +1375,7 @@ } ], "dependency_version_2": true, - "terraform_version": "1.10.5", - "ignore_readme": true + "terraform_version": "1.10.5" } ] } From 321fecceeb940e9f5206a99de3a3d7aa465573f7 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Fri, 31 Oct 2025 13:25:41 +0530 Subject: [PATCH 2/5] updated the description --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2c56b054..e1917844 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -294,7 +294,7 @@ "key": "default_worker_pool_machine_type", "type": "string", "default_value": "", - "description": "a worker node flavor", + "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", "required": true, "custom_config": { "type": "worker_node_flavors", From a39038548d689910f6f9b4655d25da65a579486f Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Fri, 31 Oct 2025 13:31:34 +0530 Subject: [PATCH 3/5] small fix --- ibm_catalog.json | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 0d6b19a1..93e2a061 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -76,15 +76,6 @@ "install_type": "fullstack", "working_directory": "solutions/fully-configurable", "release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes", - "compliance": { - "authority": "scc-v3", - "profiles": [ - { - "profile_name": "IBM Cloud Framework for Financial Services", - "profile_version": "1.7.0" - } - ] - }, "iam_permissions": [ { "role_crns": [ @@ -266,8 +257,12 @@ { "key": "openshift_version", "required": true, - "default_value": "4.18", + "default_value": "4.19", "options": [ + { + "displayname": "4.19", + "value": "4.19" + }, { "displayname": "4.18", "value": "4.18" @@ -1303,9 +1298,13 @@ }, { "key": "openshift_version", - "default_value": "4.18", + "default_value": "4.19", "required": true, "options": [ + { + "displayname": "4.19", + "value": "4.19" + }, { "displayname": "4.18", "value": "4.18" From 6221259b176f3eb58ef525378fb34d07c414ef64 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 4 Nov 2025 13:04:57 +0530 Subject: [PATCH 4/5] removed the default_value field --- ibm_catalog.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 93e2a061..135af512 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -288,7 +288,6 @@ { "key": "default_worker_pool_machine_type", "type": "string", - "default_value": "", "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", "required": true, "custom_config": { From a1555e93fceec105cd711e308d04be0d143ec426 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 4 Nov 2025 15:30:53 +0530 Subject: [PATCH 5/5] removed additional fields --- ibm_catalog.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 6f94e56b..e22d27e6 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -287,15 +287,12 @@ }, { "key": "default_worker_pool_machine_type", - "type": "string", - "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", "required": true, "custom_config": { "type": "worker_node_flavors", "grouping": "deployment", "original_grouping": "deployment" - }, - "virtual": false + } }, { "key": "default_worker_pool_workers_per_zone",