From 5419c321b50b848ef7fe5e22696f782bde7fbac6 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 13:01:10 +0530 Subject: [PATCH 01/10] Added the new worker node flavors widget --- ibm_catalog.json | 191 +++-------------------------------------------- 1 file changed, 9 insertions(+), 182 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index f408e51d..c8985eb5 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -595,189 +595,16 @@ }, { "key": "default_worker_pool_machine_type", - "type": "string", "required": true, - "virtual": true, - "default_value": "bx2.8x32", - "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" - } - ], - "description": "The machine type for worker nodes.[Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)." + "type": "string", + "default_value": "", + "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", + "custom_config": { + "type": "worker_node_flavors", + "grouping": "deployment", + "original_grouping": "deployment" + }, + "virtual": true }, { "key": "default_worker_pool_workers_per_zone", From 448157d696a2496396c44005e7764eb79a2c2f83 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 13:07:54 +0530 Subject: [PATCH 02/10] small fix --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index c8985eb5..1ae17acb 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -597,7 +597,7 @@ "key": "default_worker_pool_machine_type", "required": true, "type": "string", - "default_value": "", + "default_value": "bx2.8x32", "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", "custom_config": { "type": "worker_node_flavors", From afa24029bc55f7c5ac1373e9f356143595320609 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 13:13:59 +0530 Subject: [PATCH 03/10] update ibm_catalog.json --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index c8985eb5..1ae17acb 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -597,7 +597,7 @@ "key": "default_worker_pool_machine_type", "required": true, "type": "string", - "default_value": "", + "default_value": "bx2.8x32", "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", "custom_config": { "type": "worker_node_flavors", From 5c08e7317a73b05cdd6f9929d65719863143de40 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 4 Nov 2025 15:47:05 +0530 Subject: [PATCH 04/10] updated machine type --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1ae17acb..314d5f07 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -597,7 +597,7 @@ "key": "default_worker_pool_machine_type", "required": true, "type": "string", - "default_value": "bx2.8x32", + "default_value": "bx2.4x16", "description": "A worker node flavor that defines the architecture, virtual CPU, memory, and disk space in the default worker pool.", "custom_config": { "type": "worker_node_flavors", From f10d8d9cded5c470d723fac8a5ee0a81b9f6f952 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Fri, 7 Nov 2025 18:55:43 +0530 Subject: [PATCH 05/10] added custom config --- ibm_catalog.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 4ec08192..f4ef6bfb 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -606,7 +606,15 @@ "custom_config": { "type": "worker_node_flavors", "grouping": "deployment", - "original_grouping": "deployment" + "original_grouping": "deployment", + "associations": { + "parameters": [ + { + "name": "region", + "optionsRefresh": true + } + ] + } }, "virtual": true }, From be9278a55e3360cb5f559e8196771af6c2657d44 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Wed, 19 Nov 2025 14:30:16 +0530 Subject: [PATCH 06/10] merge --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 6e835499..bb642791 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 6e83549924fb8d8ae4933ba269baee0926a6f623 +Subproject commit bb64279162cdd0eecd962220d538fd8f41e922e7 From 4b276a5c520cdd6f0752ddfb3e3df36cf00f66a5 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Wed, 19 Nov 2025 14:45:56 +0530 Subject: [PATCH 07/10] submodule update --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index bb642791..37f2eb4d 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit bb64279162cdd0eecd962220d538fd8f41e922e7 +Subproject commit 37f2eb4d1f5286752b21be52d89e77ae1614570c From c698584c8d9d5982a6cd75289da9c5a4ac332de1 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Thu, 20 Nov 2025 10:47:01 +0530 Subject: [PATCH 08/10] readme update by pre-commit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f7b32c49..f5615b0b 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ This module supports the provisioning of an agent to an IBM Cloud Red Hat OpenSh ## Overview * [terraform-ibm-monitoring-agent](#terraform-ibm-monitoring-agent) * [Examples](./examples) - *
Deploy to IBM Cloud button
- *
Deploy to IBM Cloud button
+ *
Deploy to IBM Cloud button
+ *
Deploy to IBM Cloud button
* [Contributing](#contributing) From 8d77f4ebf43987aefc7eb406cebe881054f6aead Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 25 Nov 2025 11:47:54 +0530 Subject: [PATCH 09/10] rebase --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index fa67327a..cefc143f 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit fa67327af1a57a7a9094adb0432e44b1478f25b0 +Subproject commit cefc143fe9db966925c422ed7c67d7554288e8ff From 53323c0523bc00710aff033c05eca290a6322b1b Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 25 Nov 2025 11:50:44 +0530 Subject: [PATCH 10/10] submodule update --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index cefc143f..fa67327a 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit cefc143fe9db966925c422ed7c67d7554288e8ff +Subproject commit fa67327af1a57a7a9094adb0432e44b1478f25b0