From d07f1f186db02770f57b86aa712ad1b4553af228 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 12:19:44 +0530 Subject: [PATCH 1/2] Added the new worker node flavors widget --- .secrets.baseline | 4 +- common-dev-assets | 2 +- ibm_catalog.json | 374 +++------------------------------------------- 3 files changed, 21 insertions(+), 359 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 72f4e430e..a3847fee9 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "go.sum|^.secrets.baseline$", "lines": null }, - "generated_at": "2025-10-30T11:04:18Z", + "generated_at": "2025-11-03T06:45:13Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -88,7 +88,7 @@ } ] }, - "version": "0.13.1+ibm.62.dss", + "version": "0.13.1+ibm.64.dss", "word_list": { "file": null, "hash": null diff --git a/common-dev-assets b/common-dev-assets index 84e744a27..633c66c4d 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 84e744a27f774dac276e9381db01b6fe378c0af3 +Subproject commit 633c66c4db0583f9d2172b84b218469df60cd199 diff --git a/ibm_catalog.json b/ibm_catalog.json index 166ed50b0..396ea4d39 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1174,185 +1174,16 @@ }, { "key": "flavor", + "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, - "options": [ - { - "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": "entitlement" @@ -1486,185 +1317,16 @@ }, { "key": "flavor", + "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, - "options": [ - { - "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": "ibmcloud_api_key" From c2f04731a1d91f946126fda65a0c84ce1d264dc6 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 4 Nov 2025 15:36:16 +0530 Subject: [PATCH 2/2] removed unnecessary fields --- ibm_catalog.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index a79452c52..34ef665ba 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1174,16 +1174,12 @@ }, { "key": "flavor", - "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": { "type": "worker_node_flavors", "grouping": "deployment", "original_grouping": "deployment" - }, - "virtual": false + } }, { "key": "entitlement" @@ -1317,16 +1313,12 @@ }, { "key": "flavor", - "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": { "type": "worker_node_flavors", "grouping": "deployment", "original_grouping": "deployment" - }, - "virtual": false + } }, { "key": "ibmcloud_api_key"