From 22306e1289a5704a2a253b8c70cfe36120bbf090 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 12:15:54 +0530 Subject: [PATCH 1/8] Added the new worker node flavors widget --- ibm_catalog.json | 190 +++-------------------------------------------- 1 file changed, 9 insertions(+), 181 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 7a0252c..ff9775d 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -492,188 +492,16 @@ }, { "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, - "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)." + "custom_config": { + "type": "worker_node_flavors", + "grouping": "deployment", + "original_grouping": "deployment" + }, + "virtual": false }, { "key": "default_worker_pool_workers_per_zone", From d2f2c8db36318fb83a625e2862214ec8530841d2 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 13:00:49 +0530 Subject: [PATCH 2/8] small fix --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index ff9775d..29ff2d1 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -501,7 +501,7 @@ "grouping": "deployment", "original_grouping": "deployment" }, - "virtual": false + "virtual": true }, { "key": "default_worker_pool_workers_per_zone", From d4c8027da19668c589ad08c9c006a54f1ef61492 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 13:07:47 +0530 Subject: [PATCH 3/8] small fix --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 29ff2d1..a83a6c4 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -493,7 +493,7 @@ { "key": "default_worker_pool_machine_type", "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.", "required": true, "custom_config": { From cb5bd7149d7fbe84c7c485ddf2c9d6b4b8858188 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Mon, 3 Nov 2025 13:15:36 +0530 Subject: [PATCH 4/8] update ibm_catalog.json --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index ff9775d..a83a6c4 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -493,7 +493,7 @@ { "key": "default_worker_pool_machine_type", "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.", "required": true, "custom_config": { @@ -501,7 +501,7 @@ "grouping": "deployment", "original_grouping": "deployment" }, - "virtual": false + "virtual": true }, { "key": "default_worker_pool_workers_per_zone", From 944d183a42592bcf42a8608149ba684666e45a1a Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 4 Nov 2025 14:27:14 +0530 Subject: [PATCH 5/8] updated the default machine type --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index a83a6c4..592bfe5 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -493,7 +493,7 @@ { "key": "default_worker_pool_machine_type", "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.", "required": true, "custom_config": { From f82e7667310825e93f2b19377adc0bfd916de366 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 4 Nov 2025 14:29:58 +0530 Subject: [PATCH 6/8] updated the default machine type --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 6678e29..f89d237 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -503,7 +503,7 @@ { "key": "default_worker_pool_machine_type", "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.", "required": true, "custom_config": { From 82f823e32fad450638239451fe6117877c6ef03c Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Fri, 7 Nov 2025 18:41:09 +0530 Subject: [PATCH 7/8] updated the custom config --- ibm_catalog.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index b14c626..1c139f8 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -513,7 +513,15 @@ "custom_config": { "type": "worker_node_flavors", "grouping": "deployment", - "original_grouping": "deployment" + "original_grouping": "deployment", + "associations": { + "parameters": [ + { + "name": "region", + "optionsRefresh": true + } + ] + } }, "virtual": true }, From 49258946e4cc94b252792990ebabc255b092ad88 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Sahu Date: Tue, 11 Nov 2025 11:49:33 +0530 Subject: [PATCH 8/8] updated the submodule --- README.md | 4 ++-- common-dev-assets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f7d7c3a..2345658 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ This module deploys the following logs agent to an IBM Cloud Red Hat OpenShift C ## Overview * [terraform-ibm-logs-agent](#terraform-ibm-logs-agent) * [Examples](./examples) - *
Deploy to IBM Cloud button
- *
Deploy to IBM Cloud button
+ * [Logs agent on Kubernetes using CSE ingress endpoint with an apikey](./examples/logs-agent-iks) + * [Logs agent on OCP using VPE ingress endpoint with a Trusted Profile](./examples/logs-agent-ocp) * [Contributing](#contributing) diff --git a/common-dev-assets b/common-dev-assets index c432877..89d534a 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit c4328778ce1a62bc85f641d9249adaac0493cfc9 +Subproject commit 89d534a2f4f6baf29655e0bccf793ef9ac113619