From e2c051abdb688ae65ba17acc42bf31d109b2414f Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Fri, 22 May 2026 18:28:20 +0530 Subject: [PATCH 01/19] [patch] kubernetes<36 fix applied --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 409770ca..1fa45e3c 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ def get_version(rel_path): install_requires=[ 'pyyaml', # MIT License 'openshift', # Apache Software License - 'kubernetes', # Apache Software License + 'kubernetes<36', # Apache Software License 'kubeconfig', # BSD License 'setuptools', # MIT License (required to install kubeconfig) 'jinja2', # BSD License From 7aef370dc98de3345223c9edf27fc369ee43f3c8 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Fri, 22 May 2026 21:10:03 +0530 Subject: [PATCH 02/19] [patch] reverted changes for temp disable ocp tests as workaround applied --- .github/workflows/python-package.yml | 2 +- test/src/test_mas.py | 27 ++++++++++----------------- test/src/test_olm.py | 27 ++++++++++----------------- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e3104427..edb21ef4 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -46,7 +46,7 @@ jobs: cat ${GITHUB_WORKSPACE}/src/mas/devops/__init__.py python -m pip install --upgrade pip pip install .[dev] - python -m pytest -m "not openshift" + python -m pytest - name: Lint with flake8 run: | diff --git a/test/src/test_mas.py b/test/src/test_mas.py index 5a775e30..3902a1e7 100644 --- a/test/src/test_mas.py +++ b/test/src/test_mas.py @@ -8,7 +8,6 @@ # # ***************************************************************************** -import pytest from openshift import dynamic from kubernetes import config from kubernetes.client import api_client @@ -16,18 +15,12 @@ from mas.devops import mas -pytestmark = pytest.mark.openshift +dynClient = dynamic.DynamicClient( + api_client.ApiClient(configuration=config.load_kube_config()) +) -@pytest.fixture(scope="module") -def dynClient(): - """Create DynamicClient for OpenShift cluster access.""" - return dynamic.DynamicClient( - api_client.ApiClient(configuration=config.load_kube_config()) - ) - - -def test_entitlement(dynClient): +def test_entitlement(): icrUsername = "testing-i" icrPassword = "not-a-real-password-i" @@ -37,7 +30,7 @@ def test_entitlement(dynClient): assert secret.metadata.name == "ibm-entitlement" -def test_entitlement_with_artifactory(dynClient): +def test_entitlement_with_artifactory(): artifactoryUsername = "testing-a" artifactoryPassword = "not-a-real-password-a" @@ -50,7 +43,7 @@ def test_entitlement_with_artifactory(dynClient): assert secret.metadata.name == "ibm-entitlement" -def test_entitlement_alt_name(dynClient): +def test_entitlement_alt_name(): icrUsername = "testing-i" icrPassword = "not-a-real-password-i" @@ -60,23 +53,23 @@ def test_entitlement_alt_name(dynClient): assert secret.metadata.name == "ibm-entitlement-key" -def test_get_channel(dynClient): +def test_get_channel(): channel = mas.getMasChannel(dynClient, "doesnotexist") assert channel is None -def test_is_airgap_install(dynClient): +def test_is_airgap_install(): # The cluster we are using to test with does not have the MAS ICSP or IDMS installed assert mas.isAirgapInstall(dynClient) is False assert mas.isAirgapInstall(dynClient, checkICSP=False) is False -def test_get_mas_public_cluster_issuer(dynClient): +def test_get_mas_public_cluster_issuer(): # Test with non-existent instance - should return None issuer = mas.getMasPublicClusterIssuer(dynClient, "doesnotexist") assert issuer is None -# def test_is_app_ready(dynClient): +# def test_is_app_ready(): # mas.waitForAppReady(dynClient, "fvtcpd", "iot") # mas.waitForAppReady(dynClient, "fvtcpd", "iot", "masdev") diff --git a/test/src/test_olm.py b/test/src/test_olm.py index e0357356..354a9e2a 100644 --- a/test/src/test_olm.py +++ b/test/src/test_olm.py @@ -8,25 +8,18 @@ # # ***************************************************************************** -import pytest from openshift import dynamic from kubernetes import config from kubernetes.client import api_client from mas.devops import olm, ocp -pytestmark = pytest.mark.openshift +dynClient = dynamic.DynamicClient( + api_client.ApiClient(configuration=config.load_kube_config()) +) -@pytest.fixture(scope="module") -def dynClient(): - """Create DynamicClient for OpenShift cluster access.""" - return dynamic.DynamicClient( - api_client.ApiClient(configuration=config.load_kube_config()) - ) - - -def test_get_manifest(dynClient): +def test_get_manifest(): manifest = olm.getPackageManifest(dynClient, "ibm-sls") assert manifest is not None assert manifest.metadata.name == "ibm-sls" @@ -37,12 +30,12 @@ def test_get_manifest(dynClient): assert manifest.status.packageName == "ibm-sls" -def test_get_manifest_none(dynClient): +def test_get_manifest_none(): manifest = olm.getPackageManifest(dynClient, "ibm-sls2") assert manifest is None -def test_crud(dynClient): +def test_crud(): namespace = "cli-fvt-1" subscription = olm.applySubscription(dynClient, namespace, "ibm-sls", packageChannel="3.x") assert subscription.metadata.name == "ibm-sls" @@ -69,7 +62,7 @@ def test_crud(dynClient): assert failedSubscriptionLookup2 is None -def test_crud_with_config(dynClient): +def test_crud_with_config(): namespace = "cli-fvt-2" # We don't need this, just want to test that it works testConfig = { @@ -88,7 +81,7 @@ def test_crud_with_config(dynClient): ocp.deleteNamespace(dynClient, namespace) -def test_crud_with_manual_approval(dynClient): +def test_crud_with_manual_approval(): """ Test that when installPlanApproval is Manual without a startingCSV, an OLMException is raised. @@ -112,7 +105,7 @@ def test_crud_with_manual_approval(dynClient): # Test passed - exception was raised as expected -def test_crud_with_starting_csv(dynClient): +def test_crud_with_starting_csv(): namespace = "cli-fvt-4" # Note: This test assumes a specific CSV version exists in the catalog # You may need to adjust the version based on what's available @@ -134,7 +127,7 @@ def test_crud_with_starting_csv(dynClient): ocp.deleteNamespace(dynClient, namespace) -def test_crud_with_manual_approval_and_starting_csv(dynClient): +def test_crud_with_manual_approval_and_starting_csv(): """ Test that when installPlanApproval is Manual and startingCSV is specified, the first InstallPlan is automatically approved to reach the startingCSV. From a949d7c6b7cab23aae0358fb985f3654744c3d12 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Fri, 22 May 2026 21:13:19 +0530 Subject: [PATCH 03/19] [patch] updated secret baseline --- .secrets.baseline | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 3f9e3a56..38ff60d5 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2026-05-21T00:57:00Z", + "generated_at": "2026-05-22T15:42:35Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -178,7 +178,7 @@ "hashed_secret": "94f5ed592906089c107208b29e178ddf1f9f5143", "is_secret": false, "is_verified": false, - "line_number": 42, + "line_number": 35, "type": "Secret Keyword", "verified_result": null }, @@ -186,7 +186,7 @@ "hashed_secret": "a9410d9785f49750b9f8672794fc288558c1611c", "is_secret": false, "is_verified": false, - "line_number": 55, + "line_number": 48, "type": "Secret Keyword", "verified_result": null } From a334da28f1c8fb13577e38d7aa264973f2848f78 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 25 May 2026 18:31:48 +0530 Subject: [PATCH 04/19] [patch] .py files kept the same --- .secrets.baseline | 6 +++--- test/src/test_mas.py | 27 +++++++++++++++++---------- test/src/test_olm.py | 27 +++++++++++++++++---------- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 38ff60d5..3f9e3a56 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2026-05-22T15:42:35Z", + "generated_at": "2026-05-21T00:57:00Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -178,7 +178,7 @@ "hashed_secret": "94f5ed592906089c107208b29e178ddf1f9f5143", "is_secret": false, "is_verified": false, - "line_number": 35, + "line_number": 42, "type": "Secret Keyword", "verified_result": null }, @@ -186,7 +186,7 @@ "hashed_secret": "a9410d9785f49750b9f8672794fc288558c1611c", "is_secret": false, "is_verified": false, - "line_number": 48, + "line_number": 55, "type": "Secret Keyword", "verified_result": null } diff --git a/test/src/test_mas.py b/test/src/test_mas.py index 3902a1e7..5a775e30 100644 --- a/test/src/test_mas.py +++ b/test/src/test_mas.py @@ -8,6 +8,7 @@ # # ***************************************************************************** +import pytest from openshift import dynamic from kubernetes import config from kubernetes.client import api_client @@ -15,12 +16,18 @@ from mas.devops import mas -dynClient = dynamic.DynamicClient( - api_client.ApiClient(configuration=config.load_kube_config()) -) +pytestmark = pytest.mark.openshift -def test_entitlement(): +@pytest.fixture(scope="module") +def dynClient(): + """Create DynamicClient for OpenShift cluster access.""" + return dynamic.DynamicClient( + api_client.ApiClient(configuration=config.load_kube_config()) + ) + + +def test_entitlement(dynClient): icrUsername = "testing-i" icrPassword = "not-a-real-password-i" @@ -30,7 +37,7 @@ def test_entitlement(): assert secret.metadata.name == "ibm-entitlement" -def test_entitlement_with_artifactory(): +def test_entitlement_with_artifactory(dynClient): artifactoryUsername = "testing-a" artifactoryPassword = "not-a-real-password-a" @@ -43,7 +50,7 @@ def test_entitlement_with_artifactory(): assert secret.metadata.name == "ibm-entitlement" -def test_entitlement_alt_name(): +def test_entitlement_alt_name(dynClient): icrUsername = "testing-i" icrPassword = "not-a-real-password-i" @@ -53,23 +60,23 @@ def test_entitlement_alt_name(): assert secret.metadata.name == "ibm-entitlement-key" -def test_get_channel(): +def test_get_channel(dynClient): channel = mas.getMasChannel(dynClient, "doesnotexist") assert channel is None -def test_is_airgap_install(): +def test_is_airgap_install(dynClient): # The cluster we are using to test with does not have the MAS ICSP or IDMS installed assert mas.isAirgapInstall(dynClient) is False assert mas.isAirgapInstall(dynClient, checkICSP=False) is False -def test_get_mas_public_cluster_issuer(): +def test_get_mas_public_cluster_issuer(dynClient): # Test with non-existent instance - should return None issuer = mas.getMasPublicClusterIssuer(dynClient, "doesnotexist") assert issuer is None -# def test_is_app_ready(): +# def test_is_app_ready(dynClient): # mas.waitForAppReady(dynClient, "fvtcpd", "iot") # mas.waitForAppReady(dynClient, "fvtcpd", "iot", "masdev") diff --git a/test/src/test_olm.py b/test/src/test_olm.py index 354a9e2a..e0357356 100644 --- a/test/src/test_olm.py +++ b/test/src/test_olm.py @@ -8,18 +8,25 @@ # # ***************************************************************************** +import pytest from openshift import dynamic from kubernetes import config from kubernetes.client import api_client from mas.devops import olm, ocp -dynClient = dynamic.DynamicClient( - api_client.ApiClient(configuration=config.load_kube_config()) -) +pytestmark = pytest.mark.openshift -def test_get_manifest(): +@pytest.fixture(scope="module") +def dynClient(): + """Create DynamicClient for OpenShift cluster access.""" + return dynamic.DynamicClient( + api_client.ApiClient(configuration=config.load_kube_config()) + ) + + +def test_get_manifest(dynClient): manifest = olm.getPackageManifest(dynClient, "ibm-sls") assert manifest is not None assert manifest.metadata.name == "ibm-sls" @@ -30,12 +37,12 @@ def test_get_manifest(): assert manifest.status.packageName == "ibm-sls" -def test_get_manifest_none(): +def test_get_manifest_none(dynClient): manifest = olm.getPackageManifest(dynClient, "ibm-sls2") assert manifest is None -def test_crud(): +def test_crud(dynClient): namespace = "cli-fvt-1" subscription = olm.applySubscription(dynClient, namespace, "ibm-sls", packageChannel="3.x") assert subscription.metadata.name == "ibm-sls" @@ -62,7 +69,7 @@ def test_crud(): assert failedSubscriptionLookup2 is None -def test_crud_with_config(): +def test_crud_with_config(dynClient): namespace = "cli-fvt-2" # We don't need this, just want to test that it works testConfig = { @@ -81,7 +88,7 @@ def test_crud_with_config(): ocp.deleteNamespace(dynClient, namespace) -def test_crud_with_manual_approval(): +def test_crud_with_manual_approval(dynClient): """ Test that when installPlanApproval is Manual without a startingCSV, an OLMException is raised. @@ -105,7 +112,7 @@ def test_crud_with_manual_approval(): # Test passed - exception was raised as expected -def test_crud_with_starting_csv(): +def test_crud_with_starting_csv(dynClient): namespace = "cli-fvt-4" # Note: This test assumes a specific CSV version exists in the catalog # You may need to adjust the version based on what's available @@ -127,7 +134,7 @@ def test_crud_with_starting_csv(): ocp.deleteNamespace(dynClient, namespace) -def test_crud_with_manual_approval_and_starting_csv(): +def test_crud_with_manual_approval_and_starting_csv(dynClient): """ Test that when installPlanApproval is Manual and startingCSV is specified, the first InstallPlan is automatically approved to reach the startingCSV. From ae083ec7dbcfdd04813f29a86c6337eb76f6e0f8 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Tue, 30 Jun 2026 19:15:41 +0530 Subject: [PATCH 05/19] Add CPD 5.3.1 catalog for Helm-based airgap support - Add v9-cpd531-amd64 catalog with CPD 5.3.1 component versions - Include WML, Spark, Cognos, Watson Studio CASE versions - Define shared dependencies: OpenSearch 1.2.0, CCS 12.1.0, Redis 1.3.1 - Catalog digest: sha256:caa758fef6e65944861344b12df4d84121803e7b838895fd17e1a92c6243f2f6 --- .../devops/data/catalogs/v9-cpd531-amd64.yaml | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml diff --git a/src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml b/src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml new file mode 100644 index 00000000..546da5e7 --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml @@ -0,0 +1,113 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog CPD 5.3.1 (AMD64) +# ----------------------------------------------------------------------------- +# This catalog is specifically for Cloud Pak for Data 5.3.1 Helm-based installations +# and airgap mirroring support. + +catalog_digest: sha256:caa758fef6e65944861344b12df4d84121803e7b838895fd17e1a92c6243f2f6 + +ocp_compatibility: +- "4.16" +- "4.17" +- "4.18" +- "4.19" +- "4.20" +- "4.21" + +# Cloud Pak for Data 5.3.1 Components +# ----------------------------------------------------------------------------- +# CPD 5.3.1 introduces hybrid architecture with Helm-preferred and Helm-only components + +# CPD Platform and Core Dependencies +# ----------------------------------------------------------------------------- +cp4d_platform_version: 5.3.1 # CPD Platform version +ibm_zen_version: 6.3.1 # Zen operator for CPD 5.3.1 + +# CPD 5.3.1 Helm Components - CASE Versions +# ----------------------------------------------------------------------------- +# These are the CASE bundle versions that contain the Helm charts + +# Watson Machine Learning (Helm-preferred) +wml_version: 12.1.0 # CASE version 12.1.0, Helm chart 12.1.3+timestamp + +# Analytics Engine / Spark (Helm-preferred) +spark_version: 12.1.0 # CASE version 12.1.0, Helm chart 12.1.6+timestamp + +# Cognos Analytics (Helm-only) +cognos_version: 29.1.0 # CASE version 29.1.0 + +# Watson Studio / WSL (Helm-only) +wsl_version: 12.1.0 # CASE version for Watson Studio components +wsl_runtimes_version: 12.1.0 # Watson Studio Runtimes + +# Data Refinery (Helm-only) +datarefinery_version: 12.1.0 # Data Refinery CASE version + +# Shared Dependencies for CPD 5.3.1 +# ----------------------------------------------------------------------------- +# These dependencies are shared across multiple CPD components + +# OpenSearch (required by multiple components) +opensearch_version: 1.2.0 # CASE version 1.2.0 + +# Common Core Services (required by multiple components) +ccs_build: 12.1.0 # CCS CASE version 12.1.0 + +# IBM Redis CP (required by some components) +# Note: Using 1.3.1, NOT 2.1.0 as per CPD 5.3.1 requirements +redis_extras_version: 1.3.1 # IBM Redis CP CASE version + +# Other CPD Dependencies +# ----------------------------------------------------------------------------- +db2u_version: 7.3.1 # DB2U operator version +db2_channel_default: v110509.0 # Default Channel version for db2u-operator +postgress_version: 5.16.0 # PostgreSQL operator for CPD +mongodb_version: 5.0.0 # MongoDB for CPD components + +# MAS Dependencies (if needed alongside CPD) +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.17 # IBM Licensing operator +common_svcs_version: 4.13.0 # Common Services +sls_version: 3.12.8 # Suite License Service +tsm_version: 1.7.6 # Truststore Manager +uds_version: 2.0.12 # UDS operator +events_version: 5.0.1 # Events operator + +# Extra Images +# ----------------------------------------------------------------------------- +uds_extras_version: 1.5.0 +mongo_extras_version_default: 8.0.20 +db2u_extras_version: 1.0.6 +db2u_filter: db2 +ccs_extras_version: 12.1.0 +amlen_extras_version: 1.1.4 +minio_version: RELEASE.2025-06-13T11-33-47Z + +# Default Cloud Pak for Data version +# ----------------------------------------------------------------------------- +cpd_product_version_default: 5.3.1 + +editorial: + whats_new: + - title: '**Cloud Pak for Data 5.3.1 Support**' + details: + - Cloud Pak for Data 5.3.1 with Helm-based installation support + - Watson Machine Learning v12.1.0 (Helm-preferred) + - Analytics Engine / Spark v12.1.0 (Helm-preferred) + - Cognos Analytics v29.1.0 (Helm-only) + - Watson Studio / WSL v12.1.0 (Helm-only) + - OpenSearch v1.2.0 (shared dependency) + - Common Core Services v12.1.0 (shared dependency) + - IBM Redis CP v1.3.1 (shared dependency) + + known_issues: + - title: CPD 5.3.1 uses hybrid architecture with both OLM and Helm components + details: + - Some components are Helm-only (Watson Studio, Cognos) + - Some components are Helm-preferred (WML, Spark) + - Refer to component-support.yml for installation method requirements + - title: Shared dependencies must be installed before dependent components + details: + - OpenSearch, CCS, and IBM Redis CP are shared across multiple components + - Install these dependencies first to avoid conflicts + - Use the dependency checking logic in install-helm.yml From 034fa2cc276e2803520df6e590c8dc0c4000d137 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Wed, 1 Jul 2026 10:53:00 +0530 Subject: [PATCH 06/19] Update test to expect v9-cpd531-amd64 as newest catalog The v9-cpd531-amd64 catalog is a special catalog for CPD 5.3.1 Helm testing and comes after v9-260625-amd64 alphabetically. --- test/src/test_data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/src/test_data.py b/test/src/test_data.py index c7a7345e..1b450b7f 100644 --- a/test/src/test_data.py +++ b/test/src/test_data.py @@ -32,7 +32,8 @@ def test_list_catalogs(): def test_get_newest_catalog_tag(): catalogTag = getNewestCatalogTag("amd64") # Reminder: update this test when adding a new catalog each month! - assert catalogTag == "v9-260625-amd64" + # Note: v9-cpd531-amd64 is a special catalog for CPD 5.3.1 Helm testing + assert catalogTag == "v9-cpd531-amd64" def test_get_newest_catalog_tag_fail(): From 8f3ba79bff96912b637f7bee4eba2057683b4141 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Wed, 1 Jul 2026 12:47:47 +0530 Subject: [PATCH 07/19] Update v9-260527-amd64 catalog with CPD 5.3.1 Helm versions - Update WML, Spark, Cognos, Watson Studio to CASE 12.1.0/29.1.0 - Update shared dependencies: OpenSearch 1.2.0, CCS 12.1.0 - Set default CPD version to 5.3.1 - Remove separate v9-cpd531-amd64 catalog (consolidated into existing) - Revert test to expect v9-260625-amd64 as newest catalog --- .../devops/data/catalogs/v9-260527-amd64.yaml | 24 ++-- .../devops/data/catalogs/v9-cpd531-amd64.yaml | 113 ------------------ test/src/test_data.py | 3 +- 3 files changed, 13 insertions(+), 127 deletions(-) delete mode 100644 src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 9446add0..2c3b29d7 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -31,22 +31,22 @@ sls_version: 3.12.8 # No Update # Operator version 3.12.7 (htt tsm_version: 1.7.6 # No Update # Operator version 1.7.6 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) dd_version: 1.1.23 # No Update # Operator version 1.1.23 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change -wsl_version: 11.0.0+20250521.202913.73 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified -wsl_runtimes_version: 11.0.0+20250515.090949.21 # cpd 5.1.3 uses version 10.3.0 of wsl runtimes but only 10.2.0 for wsl itself -wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0 -postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d -ccs_build: 11.0.0+20250605.130237.468 # cpd 5.2.0 using ccs build +# CPD 5.3.1 Helm Component Versions (CASE versions for Helm charts) +wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm +wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version +wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learning CASE version for Helm +postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d -# I have added this as a guess as to the actual version used, we are currently using the wsl_version, but that does not exist for datarefinery -# See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689 -datarefinery_version: 11.0.0+20250513.203727.232 +# CPD 5.3.1 Shared Dependencies +ccs_build: 12.1.0 # CPD 5.3.1 Common Core Services CASE version +opensearch_version: 1.2.0 # CPD 5.3.1 OpenSearch CASE version +datarefinery_version: 12.1.0 # CPD 5.3.1 Data Refinery CASE version -spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0 -cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0 +spark_version: 12.1.0 # CPD 5.3.1 Analytics Engine/Spark CASE version for Helm +cognos_version: 29.1.0 # CPD 5.3.1 Cognos Analytics CASE version for Helm (Helm-only) couchdb_version: 1.0.13 # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml) elasticsearch_version: 1.1.2667 # Operator version 1.1.2667 # used in cpd 5.1.3 only -opensearch_version: 1.1.2494 # Operator version 1.1.2494 # Dependencies - Opendata hub # ----------------------------------------------------------------------------- @@ -167,7 +167,7 @@ redis_extras_version: 2.1.40 # No Update # Default Cloud Pak for Data version # ------------------------------------------------------------------------------ -cpd_product_version_default: 5.2.0 # No Update +cpd_product_version_default: 5.3.1 # Updated for CPD 5.3.1 Helm support minio_version: RELEASE.2025-06-13T11-33-47Z diff --git a/src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml b/src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml deleted file mode 100644 index 546da5e7..00000000 --- a/src/mas/devops/data/catalogs/v9-cpd531-amd64.yaml +++ /dev/null @@ -1,113 +0,0 @@ ---- -# Case bundle configuration for IBM Maximo Operator Catalog CPD 5.3.1 (AMD64) -# ----------------------------------------------------------------------------- -# This catalog is specifically for Cloud Pak for Data 5.3.1 Helm-based installations -# and airgap mirroring support. - -catalog_digest: sha256:caa758fef6e65944861344b12df4d84121803e7b838895fd17e1a92c6243f2f6 - -ocp_compatibility: -- "4.16" -- "4.17" -- "4.18" -- "4.19" -- "4.20" -- "4.21" - -# Cloud Pak for Data 5.3.1 Components -# ----------------------------------------------------------------------------- -# CPD 5.3.1 introduces hybrid architecture with Helm-preferred and Helm-only components - -# CPD Platform and Core Dependencies -# ----------------------------------------------------------------------------- -cp4d_platform_version: 5.3.1 # CPD Platform version -ibm_zen_version: 6.3.1 # Zen operator for CPD 5.3.1 - -# CPD 5.3.1 Helm Components - CASE Versions -# ----------------------------------------------------------------------------- -# These are the CASE bundle versions that contain the Helm charts - -# Watson Machine Learning (Helm-preferred) -wml_version: 12.1.0 # CASE version 12.1.0, Helm chart 12.1.3+timestamp - -# Analytics Engine / Spark (Helm-preferred) -spark_version: 12.1.0 # CASE version 12.1.0, Helm chart 12.1.6+timestamp - -# Cognos Analytics (Helm-only) -cognos_version: 29.1.0 # CASE version 29.1.0 - -# Watson Studio / WSL (Helm-only) -wsl_version: 12.1.0 # CASE version for Watson Studio components -wsl_runtimes_version: 12.1.0 # Watson Studio Runtimes - -# Data Refinery (Helm-only) -datarefinery_version: 12.1.0 # Data Refinery CASE version - -# Shared Dependencies for CPD 5.3.1 -# ----------------------------------------------------------------------------- -# These dependencies are shared across multiple CPD components - -# OpenSearch (required by multiple components) -opensearch_version: 1.2.0 # CASE version 1.2.0 - -# Common Core Services (required by multiple components) -ccs_build: 12.1.0 # CCS CASE version 12.1.0 - -# IBM Redis CP (required by some components) -# Note: Using 1.3.1, NOT 2.1.0 as per CPD 5.3.1 requirements -redis_extras_version: 1.3.1 # IBM Redis CP CASE version - -# Other CPD Dependencies -# ----------------------------------------------------------------------------- -db2u_version: 7.3.1 # DB2U operator version -db2_channel_default: v110509.0 # Default Channel version for db2u-operator -postgress_version: 5.16.0 # PostgreSQL operator for CPD -mongodb_version: 5.0.0 # MongoDB for CPD components - -# MAS Dependencies (if needed alongside CPD) -# ----------------------------------------------------------------------------- -ibm_licensing_version: 4.2.17 # IBM Licensing operator -common_svcs_version: 4.13.0 # Common Services -sls_version: 3.12.8 # Suite License Service -tsm_version: 1.7.6 # Truststore Manager -uds_version: 2.0.12 # UDS operator -events_version: 5.0.1 # Events operator - -# Extra Images -# ----------------------------------------------------------------------------- -uds_extras_version: 1.5.0 -mongo_extras_version_default: 8.0.20 -db2u_extras_version: 1.0.6 -db2u_filter: db2 -ccs_extras_version: 12.1.0 -amlen_extras_version: 1.1.4 -minio_version: RELEASE.2025-06-13T11-33-47Z - -# Default Cloud Pak for Data version -# ----------------------------------------------------------------------------- -cpd_product_version_default: 5.3.1 - -editorial: - whats_new: - - title: '**Cloud Pak for Data 5.3.1 Support**' - details: - - Cloud Pak for Data 5.3.1 with Helm-based installation support - - Watson Machine Learning v12.1.0 (Helm-preferred) - - Analytics Engine / Spark v12.1.0 (Helm-preferred) - - Cognos Analytics v29.1.0 (Helm-only) - - Watson Studio / WSL v12.1.0 (Helm-only) - - OpenSearch v1.2.0 (shared dependency) - - Common Core Services v12.1.0 (shared dependency) - - IBM Redis CP v1.3.1 (shared dependency) - - known_issues: - - title: CPD 5.3.1 uses hybrid architecture with both OLM and Helm components - details: - - Some components are Helm-only (Watson Studio, Cognos) - - Some components are Helm-preferred (WML, Spark) - - Refer to component-support.yml for installation method requirements - - title: Shared dependencies must be installed before dependent components - details: - - OpenSearch, CCS, and IBM Redis CP are shared across multiple components - - Install these dependencies first to avoid conflicts - - Use the dependency checking logic in install-helm.yml diff --git a/test/src/test_data.py b/test/src/test_data.py index 1b450b7f..c7a7345e 100644 --- a/test/src/test_data.py +++ b/test/src/test_data.py @@ -32,8 +32,7 @@ def test_list_catalogs(): def test_get_newest_catalog_tag(): catalogTag = getNewestCatalogTag("amd64") # Reminder: update this test when adding a new catalog each month! - # Note: v9-cpd531-amd64 is a special catalog for CPD 5.3.1 Helm testing - assert catalogTag == "v9-cpd531-amd64" + assert catalogTag == "v9-260625-amd64" def test_get_newest_catalog_tag_fail(): From 6b2fb410fd3d7e8146e4e534eeceb0a4f482c8f5 Mon Sep 17 00:00:00 2001 From: Prajesh Jain Date: Tue, 7 Jul 2026 12:57:51 +0530 Subject: [PATCH 08/19] [patch] updated zen version --- src/mas/devops/data/catalogs/v9-260527-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 2c3b29d7..345179fa 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -22,7 +22,7 @@ common_svcs_version: 4.13.0 # Operator version 4.13.0 (https #common_svcs_version_1: 4.11.0 # Additional version 4.11.0 cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5.2.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) -ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored +ibm_zen_version: 6.4.0+20260210.170932.92 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) db2_channel_default: v110509.0 # Default Channel version for db2u-operator From 1bc34efc55f5c43b74a378d6a68ded03a979d759 Mon Sep 17 00:00:00 2001 From: Prajesh Jain Date: Tue, 7 Jul 2026 18:28:33 +0530 Subject: [PATCH 09/19] [patch] updated versions for catalogs --- src/mas/devops/data/catalogs/v9-260527-amd64.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 345179fa..8febd849 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -17,14 +17,14 @@ ocp_compatibility: # Dependencies # ----------------------------------------------------------------------------- -ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) -common_svcs_version: 4.13.0 # Operator version 4.13.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +ibm_licensing_version: 4.2.20 # Operator version 4.2.20 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) +common_svcs_version: 4.17.0 # Operator version 4.17.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) #common_svcs_version_1: 4.11.0 # Additional version 4.11.0 -cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5.2.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) +cp4d_platform_version: 5.4.0+20260501.120952.925.640.50 # Operator version 5.4.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) ibm_zen_version: 6.4.0+20260210.170932.92 # For CPD5 ibm-zen has to be explicitily mirrored -db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +db2u_version: 7.5.2+20260224.152548.19265 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) db2_channel_default: v110509.0 # Default Channel version for db2u-operator uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.12.8 # No Update # Operator version 3.12.7 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -36,7 +36,7 @@ appconnect_version: 6.2.0 # Operator version 6.2.0 # stick wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learning CASE version for Helm -postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d +postgress_version: 5.31.0+20260129.161021.2713 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d # CPD 5.3.1 Shared Dependencies ccs_build: 12.1.0 # CPD 5.3.1 Common Core Services CASE version From 9b189a11d07a9014b7f0d786dfdf49c639872df8 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Sat, 15 Aug 2026 00:32:35 +0530 Subject: [PATCH 10/19] Update v9-260827-amd64.yaml with cpd 531 --- .../devops/data/catalogs/v9-260827-amd64.yaml | 49 ++++++++++++------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml index a858bd6f..7637cae7 100644 --- a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml @@ -18,29 +18,40 @@ ocp_compatibility: # Dependencies - Cloud Pak for Data # ----------------------------------------------------------------------------- -cpd_product_version_default: 5.2.0 # No Update +cpd_product_version_default: 5.3.1 # cpd 5.3.1 -ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) -common_svcs_version: 4.13.0 # Operator version 4.13.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +# Dependencies +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.20 # Operator version 4.2.20 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) +common_svcs_version: 4.17.0 # Operator version 4.17.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) #common_svcs_version_1: 4.11.0 # Additional version 4.11.0 -cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5.2.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) -ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored -wsl_version: 11.0.0+20250521.202913.73 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified -wsl_runtimes_version: 11.0.0+20250515.090949.21 # cpd 5.1.3 uses version 10.3.0 of wsl runtimes but only 10.2.0 for wsl itself -wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0 -spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0 -cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0 -postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d -ccs_build: 11.0.0+20250605.130237.468 # cpd 5.2.0 using ccs build -ccs_extras_version: 11.0.0 # Extra Images for CCS used for PCD 5.2.0 Hotfix +cp4d_platform_version: 5.4.0+20260501.120952.925.640.50 # Operator version 5.4.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) +ibm_zen_version: 6.4.0+20260210.170932.92 # For CPD5 ibm-zen has to be explicitily mirrored + +db2u_version: 7.5.2+20260224.152548.19265 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +db2_channel_default: v110509.0 # Default Channel version for db2u-operator +uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change +sls_version: 3.12.8 # No Update # Operator version 3.12.7 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.7.6 # No Update # Operator version 1.7.6 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +dd_version: 1.1.23 # No Update # Operator version 1.1.23 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) +appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change + +# CPD 5.3.1 Helm Component Versions (CASE versions for Helm charts) +wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm +wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version +wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learning CASE version for Helm +postgress_version: 5.31.0+20260129.161021.2713 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d -elasticsearch_version: 1.1.2667 # Operator version 1.1.2667 # used in cpd 5.1.3 only -opensearch_version: 1.1.2494 # Operator version 1.1.2494 +# CPD 5.3.1 Shared Dependencies +ccs_build: 12.1.0 # CPD 5.3.1 Common Core Services CASE version +opensearch_version: 1.2.0 # CPD 5.3.1 OpenSearch CASE version +datarefinery_version: 12.1.0 # CPD 5.3.1 Data Refinery CASE version -# I have added this as a guess as to the actual version used, we are currently using the wsl_version, but that does not exist for datarefinery -# See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689 -datarefinery_version: 11.0.0+20250513.203727.232 +spark_version: 12.1.0 # CPD 5.3.1 Analytics Engine/Spark CASE version for Helm +cognos_version: 29.1.0 # CPD 5.3.1 Cognos Analytics CASE version for Helm (Helm-only) +couchdb_version: 1.0.13 # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml) +elasticsearch_version: 1.1.2667 # Dependencies - Db2u @@ -204,4 +215,4 @@ editorial: whats_new: - title: '**Security updates and bug fixes**' details: - - IBM Maximo Application Suite Core Platform v9.2.2 \ No newline at end of file + - IBM Maximo Application Suite Core Platform v9.2.2 From 9fb23ff91f7de79630c4ab684b9f2bb5104f85f7 Mon Sep 17 00:00:00 2001 From: SahilSheikh1 Date: Sat, 15 Aug 2026 11:57:54 +0530 Subject: [PATCH 11/19] [patch] add redis_version as redis operator not present in wml case --- src/mas/devops/data/catalogs/v9-260527-amd64.yaml | 1 + src/mas/devops/data/catalogs/v9-260827-amd64.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 8febd849..1658e86a 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -36,6 +36,7 @@ appconnect_version: 6.2.0 # Operator version 6.2.0 # stick wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learning CASE version for Helm +redis_version: 1.3.1 # CPD 5.3.1 Redis CASE version (WML dependency) postgress_version: 5.31.0+20260129.161021.2713 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d # CPD 5.3.1 Shared Dependencies diff --git a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml index 7637cae7..d226f77c 100644 --- a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml @@ -41,6 +41,7 @@ appconnect_version: 6.2.0 # Operator version 6.2.0 # stick wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learning CASE version for Helm +redis_version: 1.3.1 # CPD 5.3.1 Redis CASE version (WML dependency) postgress_version: 5.31.0+20260129.161021.2713 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d # CPD 5.3.1 Shared Dependencies From c5a5af125712e8d393461e8f456869abed58f257 Mon Sep 17 00:00:00 2001 From: SahilSheikh1 Date: Sat, 15 Aug 2026 12:46:42 +0530 Subject: [PATCH 12/19] [patch] test cases failing due to redis version not available in v9-260129-amd64.yaml --- src/mas/devops/data/catalogs/v9-260129-amd64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mas/devops/data/catalogs/v9-260129-amd64.yaml b/src/mas/devops/data/catalogs/v9-260129-amd64.yaml index b40e1161..fd50830c 100644 --- a/src/mas/devops/data/catalogs/v9-260129-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260129-amd64.yaml @@ -23,6 +23,7 @@ ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be ex wsl_version: 11.0.0+20250521.202913.73 wsl_runtimes_version: 11.0.0+20250515.090949.21 wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0 +redis_version: 1.3.1 # CPD 5.3.1 Redis CASE version (WML dependency) spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0 cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0 From bf9b20de33c50e0f94d5ccb30e79734f9b16401b Mon Sep 17 00:00:00 2001 From: SahilSheikh1 Date: Sat, 15 Aug 2026 13:47:30 +0530 Subject: [PATCH 13/19] [patch] empty commit to trigger build From 324c59a0599eb14e1eea148166f2073173acb6a9 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 17 Aug 2026 18:26:07 +0530 Subject: [PATCH 14/19] [patch] updated catalog --- .../devops/data/catalogs/v9-260527-amd64.yaml | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 1658e86a..446d907f 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -17,20 +17,24 @@ ocp_compatibility: # Dependencies # ----------------------------------------------------------------------------- -ibm_licensing_version: 4.2.20 # Operator version 4.2.20 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) -common_svcs_version: 4.17.0 # Operator version 4.17.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) +common_svcs_version: 4.13.0 # Operator version 4.13.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) #common_svcs_version_1: 4.11.0 # Additional version 4.11.0 -cp4d_platform_version: 5.4.0+20260501.120952.925.640.50 # Operator version 5.4.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) -ibm_zen_version: 6.4.0+20260210.170932.92 # For CPD5 ibm-zen has to be explicitily mirrored +cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5.2.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) +ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored -db2u_version: 7.5.2+20260224.152548.19265 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) db2_channel_default: v110509.0 # Default Channel version for db2u-operator uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.12.8 # No Update # Operator version 3.12.7 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) tsm_version: 1.7.6 # No Update # Operator version 1.7.6 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) dd_version: 1.1.23 # No Update # Operator version 1.1.23 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change +wsl_version: 11.0.0+20250521.202913.73 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified +wsl_runtimes_version: 11.0.0+20250515.090949.21 # cpd 5.1.3 uses version 10.3.0 of wsl runtimes but only 10.2.0 for wsl itself +wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0 +postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d # CPD 5.3.1 Helm Component Versions (CASE versions for Helm charts) wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm @@ -39,15 +43,15 @@ wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learn redis_version: 1.3.1 # CPD 5.3.1 Redis CASE version (WML dependency) postgress_version: 5.31.0+20260129.161021.2713 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d -# CPD 5.3.1 Shared Dependencies -ccs_build: 12.1.0 # CPD 5.3.1 Common Core Services CASE version -opensearch_version: 1.2.0 # CPD 5.3.1 OpenSearch CASE version -datarefinery_version: 12.1.0 # CPD 5.3.1 Data Refinery CASE version +# I have added this as a guess as to the actual version used, we are currently using the wsl_version, but that does not exist for datarefinery +# See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689 +datarefinery_version: 11.0.0+20250513.203727.232 -spark_version: 12.1.0 # CPD 5.3.1 Analytics Engine/Spark CASE version for Helm -cognos_version: 29.1.0 # CPD 5.3.1 Cognos Analytics CASE version for Helm (Helm-only) +spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0 +cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0 couchdb_version: 1.0.13 # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml) elasticsearch_version: 1.1.2667 # Operator version 1.1.2667 # used in cpd 5.1.3 only +opensearch_version: 1.1.2494 # Operator version 1.1.2494 # Dependencies - Opendata hub # ----------------------------------------------------------------------------- @@ -168,7 +172,7 @@ redis_extras_version: 2.1.40 # No Update # Default Cloud Pak for Data version # ------------------------------------------------------------------------------ -cpd_product_version_default: 5.3.1 # Updated for CPD 5.3.1 Helm support +cpd_product_version_default: 5.2.0 # No Update minio_version: RELEASE.2025-06-13T11-33-47Z @@ -187,4 +191,4 @@ editorial: - IBM Maximo Real Estate and Facilities [v9.1.11](https://www.ibm.com/support/pages/node/7273955) - IBM Maximo AI Service [v9.1.15](https://www.ibm.com/support/pages/node/7273795) known_issues: - - title: NA + - title: NA \ No newline at end of file From 2e47328fcdbc9d472fa68eed4ab86c995633849c Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 17 Aug 2026 18:28:19 +0530 Subject: [PATCH 15/19] [patch] updated catalog with master --- src/mas/devops/data/catalogs/v9-260129-amd64.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260129-amd64.yaml b/src/mas/devops/data/catalogs/v9-260129-amd64.yaml index fd50830c..b40e1161 100644 --- a/src/mas/devops/data/catalogs/v9-260129-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260129-amd64.yaml @@ -23,7 +23,6 @@ ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be ex wsl_version: 11.0.0+20250521.202913.73 wsl_runtimes_version: 11.0.0+20250515.090949.21 wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0 -redis_version: 1.3.1 # CPD 5.3.1 Redis CASE version (WML dependency) spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0 cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0 From ccceda042316f4535bb8c91697228d147d70058d Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 17 Aug 2026 18:33:00 +0530 Subject: [PATCH 16/19] [patch] updated catalog with master --- src/mas/devops/data/catalogs/v9-260527-amd64.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 446d907f..86c19b53 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -36,12 +36,7 @@ wsl_runtimes_version: 11.0.0+20250515.090949.21 # cpd 5.1.3 uses version 10.3.0 wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0 postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d -# CPD 5.3.1 Helm Component Versions (CASE versions for Helm charts) -wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm -wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version -wml_version: 12.1.0 # CPD 5.3.1 Watson Machine Learning CASE version for Helm -redis_version: 1.3.1 # CPD 5.3.1 Redis CASE version (WML dependency) -postgress_version: 5.31.0+20260129.161021.2713 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d +ccs_build: 11.0.0+20250605.130237.468 # cpd 5.2.0 using ccs build # I have added this as a guess as to the actual version used, we are currently using the wsl_version, but that does not exist for datarefinery # See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689 From 22d6d7b22507579aeb93e7a6343144a719a67d4e Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 17 Aug 2026 18:34:13 +0530 Subject: [PATCH 17/19] fx eof --- src/mas/devops/data/catalogs/v9-260527-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml index 86c19b53..9446add0 100644 --- a/src/mas/devops/data/catalogs/v9-260527-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260527-amd64.yaml @@ -186,4 +186,4 @@ editorial: - IBM Maximo Real Estate and Facilities [v9.1.11](https://www.ibm.com/support/pages/node/7273955) - IBM Maximo AI Service [v9.1.15](https://www.ibm.com/support/pages/node/7273795) known_issues: - - title: NA \ No newline at end of file + - title: NA From 616073dd36847df3c92de9848335afa9f33f2cc7 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 17 Aug 2026 18:49:23 +0530 Subject: [PATCH 18/19] [patch] removed duplicate entries --- src/mas/devops/data/catalogs/v9-260827-amd64.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml index d226f77c..3f84a04e 100644 --- a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml @@ -29,14 +29,6 @@ common_svcs_version: 4.17.0 # Operator version 4.17.0 (https cp4d_platform_version: 5.4.0+20260501.120952.925.640.50 # Operator version 5.4.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/) ibm_zen_version: 6.4.0+20260210.170932.92 # For CPD5 ibm-zen has to be explicitily mirrored -db2u_version: 7.5.2+20260224.152548.19265 # Operator version 110509.0.6 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v110509.0 # Default Channel version for db2u-operator -uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change -sls_version: 3.12.8 # No Update # Operator version 3.12.7 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) -tsm_version: 1.7.6 # No Update # Operator version 1.7.6 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) -dd_version: 1.1.23 # No Update # Operator version 1.1.23 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) -appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change - # CPD 5.3.1 Helm Component Versions (CASE versions for Helm charts) wsl_version: 12.1.0 # CPD 5.3.1 Watson Studio CASE version for Helm wsl_runtimes_version: 12.1.0 # CPD 5.3.1 Watson Studio Runtimes CASE version From 71340495e7a33d96d41b6865a7bcb474e22ce023 Mon Sep 17 00:00:00 2001 From: nehasangwai-ibm Date: Mon, 17 Aug 2026 18:51:45 +0530 Subject: [PATCH 19/19] [patch] couchdb duplicate entry --- src/mas/devops/data/catalogs/v9-260827-amd64.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml index 3f84a04e..3f3344b5 100644 --- a/src/mas/devops/data/catalogs/v9-260827-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260827-amd64.yaml @@ -43,7 +43,6 @@ datarefinery_version: 12.1.0 # CPD 5.3.1 Data Refinery CASE v spark_version: 12.1.0 # CPD 5.3.1 Analytics Engine/Spark CASE version for Helm cognos_version: 29.1.0 # CPD 5.3.1 Cognos Analytics CASE version for Helm (Helm-only) -couchdb_version: 1.0.13 # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml) elasticsearch_version: 1.1.2667