From d929e612edc3f7dc305f242b1273d83fa4bdf8fd Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 12 Nov 2025 00:58:40 +0530 Subject: [PATCH 01/10] feat: binary choices --- ibm_catalog.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 51e884b7d..1fa2d0726 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1426,7 +1426,27 @@ "key": "workers_per_zone" }, { - "key": "wait_till" + "key": "wait_till", + "type": "string", + "type_metadata": "string", + "default_value": "IngressReady", + "options": [ + { + "description": "Wait for ingress controller to be operational", + "displayname": "Ingress Ready", + "value": "IngressReady" + }, + { + "description": "At least one worker node is fully ready", + "displayname": "One Worker Ready", + "value": "OneWorkerNodeReady" + }, + { + "description": "Master node components are operational", + "displayname": "Master Ready", + "value": "MasterNodeReady" + } + ] }, { "key": "kms_wait_for_apply" From 37fbc0cb1d5f907b09e3f45da735e208abe8c68a Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 12 Nov 2025 14:46:23 +0530 Subject: [PATCH 02/10] feat: binary choices --- ibm_catalog.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1fa2d0726..11c9b1817 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1182,7 +1182,23 @@ } }, { - "key": "entitlement" + "key": "entitlement", + "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", + "type": "string", + "type_metadata": "string", + "default_value": "None", + "options": [ + { + "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", + "displayname": "Cloud Pak", + "value": "cloud_pak" + }, + { + "description": "Purchase an OCP license for your worker pool. The license will be provided by IBM Cloud and there is no need to handle OpenShift licensing separately.", + "displayname": "None", + "value": null + } + ] } ], "iam_permissions": [ From b3b82209d649257ee5ccce0aa8ae666a4c593a79 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 12 Nov 2025 14:49:44 +0530 Subject: [PATCH 03/10] feat: binary choices --- ibm_catalog.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 11c9b1817..7762063ed 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1468,7 +1468,23 @@ "key": "kms_wait_for_apply" }, { - "key": "entitlement" + "key": "entitlement", + "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", + "type": "string", + "type_metadata": "string", + "default_value": "None", + "options": [ + { + "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", + "displayname": "Cloud Pak", + "value": "cloud_pak" + }, + { + "description": "Purchase an OCP license for your worker pool. The license will be provided by IBM Cloud and there is no need to handle OpenShift licensing separately.", + "displayname": "None", + "value": null + } + ] }, { "key": "secondary_storage" From 8c23367a889dec2633823cfbeb366ff8daa52f30 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 12 Nov 2025 15:17:55 +0530 Subject: [PATCH 04/10] feat: binary choices --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 7762063ed..3aa33460d 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1186,7 +1186,7 @@ "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", "type": "string", "type_metadata": "string", - "default_value": "None", + "default_value": null, "options": [ { "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", @@ -1472,7 +1472,7 @@ "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", "type": "string", "type_metadata": "string", - "default_value": "None", + "default_value": null, "options": [ { "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", From 72908dae33273998e4bb3ff215c44f699fd8af41 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 12 Nov 2025 15:55:10 +0530 Subject: [PATCH 05/10] feat: binary choices --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 3aa33460d..7d3abe16a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1186,7 +1186,7 @@ "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", "type": "string", "type_metadata": "string", - "default_value": null, + "default_value": "null", "options": [ { "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", @@ -1472,7 +1472,7 @@ "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", "type": "string", "type_metadata": "string", - "default_value": null, + "default_value": "null", "options": [ { "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", From 84f3399e6e11abd9a56b76399e2c7791f2bbd917 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Wed, 12 Nov 2025 16:11:47 +0530 Subject: [PATCH 06/10] feat: binary choices --- ibm_catalog.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 7d3abe16a..4f72bcf0a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1448,17 +1448,17 @@ "default_value": "IngressReady", "options": [ { - "description": "Wait for ingress controller to be operational", + "description": "Wait for ingress controller to be operational.", "displayname": "Ingress Ready", "value": "IngressReady" }, { - "description": "At least one worker node is fully ready", + "description": "At least one worker node is fully ready.", "displayname": "One Worker Ready", "value": "OneWorkerNodeReady" }, { - "description": "Master node components are operational", + "description": "Master node components are operational.", "displayname": "Master Ready", "value": "MasterNodeReady" } From ef005c81c66d3af4a36dca14ab2e77b850c6877d Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Thu, 13 Nov 2025 21:08:58 +0530 Subject: [PATCH 07/10] feat: binary choices --- ibm_catalog.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 4f72bcf0a..0f21964ad 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1183,10 +1183,8 @@ }, { "key": "entitlement", - "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", "type": "string", "type_metadata": "string", - "default_value": "null", "options": [ { "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", @@ -1196,7 +1194,7 @@ { "description": "Purchase an OCP license for your worker pool. The license will be provided by IBM Cloud and there is no need to handle OpenShift licensing separately.", "displayname": "None", - "value": null + "value": "__NULL__" } ] } @@ -1445,7 +1443,6 @@ "key": "wait_till", "type": "string", "type_metadata": "string", - "default_value": "IngressReady", "options": [ { "description": "Wait for ingress controller to be operational.", @@ -1472,7 +1469,6 @@ "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", "type": "string", "type_metadata": "string", - "default_value": "null", "options": [ { "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", @@ -1482,7 +1478,7 @@ { "description": "Purchase an OCP license for your worker pool. The license will be provided by IBM Cloud and there is no need to handle OpenShift licensing separately.", "displayname": "None", - "value": null + "value": "__NULL__" } ] }, From 04c3a4f2dc2729e9bb173e6cca776dfd6b847b58 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 24 Nov 2025 20:54:26 +0530 Subject: [PATCH 08/10] feat: binary choices --- ibm_catalog.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8575c4fc8..16a53db0e 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1183,11 +1183,10 @@ }, { "key": "entitlement", - "type": "string", "type_metadata": "string", "options": [ { - "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", + "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select `cloud_pak` only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.", "displayname": "Cloud Pak", "value": "cloud_pak" }, @@ -1441,7 +1440,6 @@ }, { "key": "wait_till", - "type": "string", "type_metadata": "string", "options": [ { @@ -1466,12 +1464,10 @@ }, { "key": "entitlement", - "description": "Reduces the cost of additional OCP licenses in OpenShift clusters. Use Cloud Pak entitlement only if you use the cluster with a Cloud Pak that has an OpenShift entitlement. The value is set only when the cluster is created and cannot be changed later.", - "type": "string", "type_metadata": "string", "options": [ { - "description": "Apply your OCP license entitlement to your worker pool. Specify only the number and size of worker nodes that you are entitled to use.", + "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select `cloud_pak` only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.", "displayname": "Cloud Pak", "value": "cloud_pak" }, From 49be90a8d90ee222baac00a1fe3218f310e71cd8 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 24 Nov 2025 21:57:36 +0530 Subject: [PATCH 09/10] feat: binary choices --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 16a53db0e..7129e54ee 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1186,7 +1186,7 @@ "type_metadata": "string", "options": [ { - "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select `cloud_pak` only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.", + "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select this option only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.", "displayname": "Cloud Pak", "value": "cloud_pak" }, @@ -1467,7 +1467,7 @@ "type_metadata": "string", "options": [ { - "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select `cloud_pak` only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.", + "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select this option only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.", "displayname": "Cloud Pak", "value": "cloud_pak" }, From cd8006a1c8e351e28c764c46e4c637a4e37c8253 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Tue, 25 Nov 2025 21:03:35 +0530 Subject: [PATCH 10/10] cda --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 30404d6e5..191c3ec32 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 30404d6e5c384e6683e15842eb82c829e672fc1d +Subproject commit 191c3ec328a8bc402b28104c9ed5249ee5fafab3