From 9267edda3401211e9ce6e12af4632da4545a7cdc Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Fri, 27 Feb 2026 09:59:03 -0300 Subject: [PATCH 01/21] [patch] add db2_v12_upgrade --- src/mas/devops/templates/pipelinerun-update.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index 83be320e..ad982f3b 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -44,6 +44,8 @@ spec: # ------------------------------------------------------------------------- - name: db2_namespace value: "{{ db2_namespace }}" + - name: db2_v12_upgrade + value: "{{ db2_v12_upgrade }}" {%- endif %} {%- if mongodb_namespace is defined and mongodb_namespace != "" %} From 8d3d4368f2ef9cdf34943ce12049610ccd2f5c3f Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Fri, 27 Feb 2026 13:57:18 -0300 Subject: [PATCH 02/21] [patch] update catalog metadata to fetch db2 v12 --- src/mas/devops/data/catalogs/v9-260226-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml index 1b6e5300..e27dfda6 100644 --- a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml @@ -24,7 +24,7 @@ cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5. ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v110509.0 # Default Channel version for db2u-operator +db2_channel_default: v120100.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.5 # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From 5fcb0c9a953a68da4f0998c52ffe1c988d2a7950 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Thu, 5 Mar 2026 09:40:13 -0300 Subject: [PATCH 03/21] [patch] add support for 4.21 --- src/mas/devops/data/catalogs/v9-260226-amd64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml index e27dfda6..8be83ee4 100644 --- a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml @@ -13,6 +13,7 @@ ocp_compatibility: - "4.18" - "4.19" - "4.20" +- "4.21" # Dependencies # ----------------------------------------------------------------------------- From 6cda47f69d6892361685e2b4c038373efaf3fca3 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Mon, 9 Mar 2026 11:22:02 -0300 Subject: [PATCH 04/21] [patch] add db2_channel to update pipeline --- src/mas/devops/templates/pipelinerun-update.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index ad982f3b..e803a619 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -46,6 +46,8 @@ spec: value: "{{ db2_namespace }}" - name: db2_v12_upgrade value: "{{ db2_v12_upgrade }}" + - name: db2_channel + value: "{{ db2_channel }}" {%- endif %} {%- if mongodb_namespace is defined and mongodb_namespace != "" %} From e5e5205a6795b6eef13c2d8037910ea077dc2248 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Mon, 9 Mar 2026 11:25:34 -0300 Subject: [PATCH 05/21] [patch] update to latest db2 v12 --- src/mas/devops/data/catalogs/v9-260226-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml index 8be83ee4..4fb62103 100644 --- a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml @@ -25,7 +25,7 @@ cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5. ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v120100.0 # Default Channel version for db2u-operator +db2_channel_default: v120102.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.5 # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From 3c0edf397d36345917f4fa3e340862bf97de7b36 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:48:19 -0300 Subject: [PATCH 06/21] [patch] updating catalogs for db2 v12 --- src/mas/devops/data/catalogs/v9-260226-amd64.yaml | 2 +- src/mas/devops/data/catalogs/v9-260318-amd64.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml index 1676475f..71ebe280 100644 --- a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml @@ -25,7 +25,7 @@ cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5. ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v120102.0 # Default Channel version for db2u-operator +db2_channel_default: v110509.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.5 # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) diff --git a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml index 4cc27a5a..d7206817 100644 --- a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml @@ -24,7 +24,7 @@ cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5. ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v110509.0 # Default Channel version for db2u-operator +db2_channel_default: v120102.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.6 # No Update # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -49,7 +49,7 @@ opensearch_version: 1.1.2494 # Operator version 1.1.2494 # ----------------------------------------------------------------------------- mas_core_version: 9.2.x-feature: 9.2.0-pre.stable_12926 # No Update - 9.1.x: 9.1.13 # Updated + 9.1.x: 9.1.x-db212 # Updated 9.0.x: 9.0.22 # No Update 8.10.x: 8.10.35 # No Update 8.11.x: 8.11.32 # No Update From ec3eea37b1c61c29cb6d87bc6fadff6228a0b9aa Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:51:08 -0300 Subject: [PATCH 07/21] [patch] fix manage channel --- src/mas/devops/data/catalogs/v9-260318-amd64.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml index d7206817..6ddfc1a0 100644 --- a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml @@ -49,7 +49,7 @@ opensearch_version: 1.1.2494 # Operator version 1.1.2494 # ----------------------------------------------------------------------------- mas_core_version: 9.2.x-feature: 9.2.0-pre.stable_12926 # No Update - 9.1.x: 9.1.x-db212 # Updated + 9.1.x: 9.1.13 # Updated 9.0.x: 9.0.22 # No Update 8.10.x: 8.10.35 # No Update 8.11.x: 8.11.32 # No Update @@ -70,7 +70,7 @@ mas_iot_version: 8.11.x: 8.8.28 # No Update mas_manage_version: 9.2.x-feature: 9.2.0-pre.stable_13730 # No Update - 9.1.x: 9.1.14 # Updated + 9.1.x: 9.1.x-db212 # Updated 9.0.x: 9.0.23 # No Update 8.10.x: 8.6.36 # No Update 8.11.x: 8.7.30 # No Update From 06c8370e8c73958223883e506d9c5b382790ed25 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 1 Apr 2026 15:20:52 -0300 Subject: [PATCH 08/21] [patch] update db2u-operator catalog source --- src/mas/devops/data/catalogs/v9-260318-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml index 6ddfc1a0..5b03f4df 100644 --- a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml @@ -23,7 +23,7 @@ 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 -db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +db2u_version: 7.6.0+20260224.123157.19264 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) db2_channel_default: v120102.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator) uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change From 4f4bd4e210d16e709c413e9994a6bdf5ac1615a1 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 1 Apr 2026 15:30:46 -0300 Subject: [PATCH 09/21] [patch] update default subscription --- src/mas/devops/data/catalogs/v9-260318-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml index 5b03f4df..cf72c9a4 100644 --- a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml @@ -24,7 +24,7 @@ cp4d_platform_version: 5.2.0+20250709.170324 # Operator version 5. ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 7.6.0+20260224.123157.19264 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v120102.0 # Default Channel version for db2u-operator +db2_channel_default: v120104.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.6 # No Update # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From 838a68390db1ca5ae35a02e21e45866df3a2316d Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 15 Apr 2026 00:34:36 -0300 Subject: [PATCH 10/21] [patch] add db2_license_file parameter to pipeline template --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index eebbbd5a..caeb8ef8 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -118,6 +118,9 @@ spec: value: "{{ db2_timezone }}" - name: db2u_kind value: "{{ db2u_kind }}" +{%- if db2_license_file is defined and db2_license_file != "" %} + - name: db2_license_file + value: "{{ db2_license_file }}" {%- if db2_meta_storage_accessmode is defined and db2_meta_storage_accessmode != "" %} # Dependencies - Db2 - Access Mode From 4a19b65037755d55a3d595315b775a59509cbdc3 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 15 Apr 2026 01:40:55 -0300 Subject: [PATCH 11/21] [patch] add db2 license file parameter to pipeline template --- src/mas/devops/tekton.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 96054c99..83158a23 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -475,7 +475,7 @@ def prepareRestoreSecrets(dynClient: DynamicClient, namespace: str, restoreConfi secretsAPI.create(body=restoreConfigs, namespace=namespace) -def prepareInstallSecrets(dynClient: DynamicClient, namespace: str, slsLicenseFile: dict | None = None, additionalConfigs: dict | None = None, certs: dict | None = None, podTemplates: dict | None = None) -> None: +def prepareInstallSecrets(dynClient: DynamicClient, namespace: str, slsLicenseFile: dict | None = None, additionalConfigs: dict | None = None, certs: dict | None = None, podTemplates: dict | None = None, db2LicenseFile: dict | None = None) -> None: """ Create or update secrets required for MAS installation pipelines. @@ -486,6 +486,7 @@ def prepareInstallSecrets(dynClient: DynamicClient, namespace: str, slsLicenseFi dynClient (DynamicClient): OpenShift Dynamic Client namespace (str): The namespace to create secrets in slsLicenseFile (dict, optional): SLS license file content. Defaults to None (empty secret). + db2LicenseFile (dict, optional): Db2 license file content. Defaults to None (empty secret). additionalConfigs (dict, optional): Additional configuration data. Defaults to None (empty secret). certs (dict, optional): Certificate data. Defaults to None (empty secret). podTemplates (dict, optional): Pod template data. Defaults to None (empty secret). @@ -573,6 +574,24 @@ def prepareInstallSecrets(dynClient: DynamicClient, namespace: str, slsLicenseFi } secretsAPI.create(body=podTemplates, namespace=namespace) + # 6. Secret/pipeline-db2-license + # ------------------------------------------------------------------------- + try: + secretsAPI.delete(name="pipeline-db2-license", namespace=namespace) + except NotFoundError: + pass + + if db2LicenseFile is None: + db2LicenseFile = { + "apiVersion": "v1", + "kind": "Secret", + "type": "Opaque", + "metadata": { + "name": "pipeline-db2-license" + } + } + secretsAPI.create(body=db2LicenseFile, namespace=namespace) + def testCLI() -> None: pass From c606c6e39f56c8fb3d1aff9f533dd1f45259ad39 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 15 Apr 2026 13:03:16 -0300 Subject: [PATCH 12/21] [patch] update catalog for db2 v12 testing --- src/mas/devops/data/catalogs/v9-260318-amd64.yaml | 6 +++--- src/mas/devops/data/catalogs/v9-260326-amd64.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml index cf72c9a4..0bac13c0 100644 --- a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml @@ -23,8 +23,8 @@ 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 -db2u_version: 7.6.0+20260224.123157.19264 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v120104.0 # Default Channel version for db2u-operator +db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +db2_channel_default: v110509.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.6 # No Update # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -70,7 +70,7 @@ mas_iot_version: 8.11.x: 8.8.28 # No Update mas_manage_version: 9.2.x-feature: 9.2.0-pre.stable_13730 # No Update - 9.1.x: 9.1.x-db212 # Updated + 9.1.x: 9.1.14. # Updated 9.0.x: 9.0.23 # No Update 8.10.x: 8.6.36 # No Update 8.11.x: 8.7.30 # No Update diff --git a/src/mas/devops/data/catalogs/v9-260326-amd64.yaml b/src/mas/devops/data/catalogs/v9-260326-amd64.yaml index 39f04b50..24a716f6 100644 --- a/src/mas/devops/data/catalogs/v9-260326-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260326-amd64.yaml @@ -24,8 +24,8 @@ 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 -db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v110509.0 # Default Channel version for db2u-operator +db2u_version: 7.6.0+20260224.123157.19264 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +db2_channel_default: v120104.0 # Default Channel version for db2u-operator events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-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.6 # Updated # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From ea9a62c57ce433292770ea3271624c61816253a1 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 15 Apr 2026 13:04:01 -0300 Subject: [PATCH 13/21] [patch] fix typo in catalog --- src/mas/devops/data/catalogs/v9-260318-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml index 0bac13c0..4cc27a5a 100644 --- a/src/mas/devops/data/catalogs/v9-260318-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260318-amd64.yaml @@ -70,7 +70,7 @@ mas_iot_version: 8.11.x: 8.8.28 # No Update mas_manage_version: 9.2.x-feature: 9.2.0-pre.stable_13730 # No Update - 9.1.x: 9.1.14. # Updated + 9.1.x: 9.1.14 # Updated 9.0.x: 9.0.23 # No Update 8.10.x: 8.6.36 # No Update 8.11.x: 8.7.30 # No Update From 4525abf9f03f8074c5974fe802c105b9fd6a5ca2 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 15 Apr 2026 14:00:43 -0300 Subject: [PATCH 14/21] [patch] correct indentation for db2_license_file conditional block --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index caeb8ef8..f9a3a026 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -118,9 +118,10 @@ spec: value: "{{ db2_timezone }}" - name: db2u_kind value: "{{ db2u_kind }}" -{%- if db2_license_file is defined and db2_license_file != "" %} + {%- if db2_license_file is defined and db2_license_file != "" %} - name: db2_license_file value: "{{ db2_license_file }}" + {%- endif %} {%- if db2_meta_storage_accessmode is defined and db2_meta_storage_accessmode != "" %} # Dependencies - Db2 - Access Mode From b61e47e37cc6ea6706873aa8c1b686c9d9c95e42 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:02:02 -0300 Subject: [PATCH 15/21] [patch] mount db2 license in the pipeline run --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index f9a3a026..b457a0b2 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -944,3 +944,8 @@ spec: - name: shared-certificates secret: secretName: pipeline-certificates + + # The Db2 license file + - name: shared-db2 + secret: + secretName: pipeline-db2-license From e49770bfff1098d9b6668c07f848f388ee69435c Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 29 Apr 2026 13:51:15 -0300 Subject: [PATCH 16/21] [patch] add missing db2 license workspace to pipelinerun update --- src/mas/devops/templates/pipelinerun-update.yml.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index 1f8e3083..3f3e089d 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -159,3 +159,11 @@ spec: - name: aiservice_instance_ids value: "{{ aiservice_instance_ids }}" {%- endif %} +workspaces: + # The generated configuration files + # ------------------------------------------------------------------------- + + # The Db2 license file + - name: shared-db2 + secret: + secretName: pipeline-db2-license From 35a15fc64d25b912bb879bad77088816421f3201 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 29 Apr 2026 18:09:58 -0300 Subject: [PATCH 17/21] [patch] add db2 license secret handling to prepareUpdateSecrets --- src/mas/devops/tekton.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 938ebd56..c8267c44 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -634,7 +634,7 @@ def prepareInstallSecrets(dynClient: DynamicClient, namespace: str, slsLicenseFi secretsAPI.create(body=db2LicenseFile, namespace=namespace) -def prepareUpdateSlackSecrets(dynClient: DynamicClient, slack_token: str = None, slack_channel: str = None) -> None: +def prepareUpdateSecrets(dynClient: DynamicClient, slack_token: str = None, slack_channel: str = None, db2LicenseFile: dict | None = None) -> None: """ Create or update mas-devops-slack secret in mas-pipelines namespace for update pipeline. @@ -644,6 +644,7 @@ def prepareUpdateSlackSecrets(dynClient: DynamicClient, slack_token: str = None, dynClient (DynamicClient): OpenShift Dynamic Client slack_token (str, optional): Slack bot token for notifications. Defaults to None. slack_channel (str, optional): Slack channel ID for notifications. Defaults to None. + db2LicenseFile (dict, optional): Db2 license file content. Defaults to None (empty secret). Returns: None @@ -696,6 +697,23 @@ def prepareUpdateSlackSecrets(dynClient: DynamicClient, slack_token: str = None, secretsAPI.create(body=mas_devops_secret, namespace=namespace) logger.info(f"Created mas-devops-slack secret in namespace {namespace}") + try: + secretsAPI.delete(name="pipeline-db2-license", namespace=namespace) + except NotFoundError: + pass + + if db2LicenseFile is None: + db2LicenseFile = { + "apiVersion": "v1", + "kind": "Secret", + "type": "Opaque", + "metadata": { + "name": "pipeline-db2-license" + } + } + secretsAPI.create(body=db2LicenseFile, namespace=namespace) + logger.info(f"Created pipeline-db2-license secret in namespace {namespace}") + def testCLI() -> None: pass From c820f050b03fbd8c96d39bac828857fc2fb70149 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Thu, 30 Apr 2026 09:15:15 -0300 Subject: [PATCH 18/21] [patch] remove early return to allow secret creation to proceed --- src/mas/devops/tekton.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index c8267c44..bdb0a2cc 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -665,7 +665,6 @@ def prepareUpdateSecrets(dynClient: DynamicClient, slack_token: str = None, slac # Only create secret if both slack_token and slack_channel are provided if not slack_token or not slack_channel: logger.debug("Slack token or channel not provided, skipping slack secret creation") - return secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret") From e5e01ed73bd810aeb31f932f4f0e606166db3a8d Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Thu, 30 Apr 2026 14:30:44 -0300 Subject: [PATCH 19/21] [patch] add conditional rendering for db2 parameters and fix workspace indentation --- src/mas/devops/templates/pipelinerun-update.yml.j2 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index 3f3e089d..6ffdce28 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -52,8 +52,14 @@ spec: # ------------------------------------------------------------------------- - name: db2_namespace value: "{{ db2_namespace }}" +{%- if db2_v12_upgrade is defined and db2_v12_upgrade != "" %} - name: db2_v12_upgrade value: "{{ db2_v12_upgrade }}" +{%- endif %} +{%- if db2_license_file is defined and db2_license_file != "" %} + - name: db2_license_file + value: "{{ db2_license_file }}" +{%- endif %} - name: db2_channel value: "{{ db2_channel }}" {%- endif %} @@ -159,7 +165,7 @@ spec: - name: aiservice_instance_ids value: "{{ aiservice_instance_ids }}" {%- endif %} -workspaces: + workspaces: # The generated configuration files # ------------------------------------------------------------------------- From b17729012a2353b752ec4ad6230af9734f21430a Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Thu, 30 Apr 2026 14:36:08 -0300 Subject: [PATCH 20/21] [patch] rollback catalogs --- src/mas/devops/data/catalogs/v9-260226-amd64.yaml | 1 - src/mas/devops/data/catalogs/v9-260326-amd64.yaml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml index d167c2e3..f58c76d8 100644 --- a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml @@ -13,7 +13,6 @@ ocp_compatibility: - "4.18" - "4.19" - "4.20" -- "4.21" # Dependencies - Cloud Pak for Data # ----------------------------------------------------------------------------- diff --git a/src/mas/devops/data/catalogs/v9-260326-amd64.yaml b/src/mas/devops/data/catalogs/v9-260326-amd64.yaml index 7cc96dac..71409dfb 100644 --- a/src/mas/devops/data/catalogs/v9-260326-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-260326-amd64.yaml @@ -48,11 +48,11 @@ events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pa # Dependencies - Db2u # ----------------------------------------------------------------------------- +db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.7 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) db2u_extras_version: 1.0.6 # No Update db2u_filter: db2 -db2u_version: 7.6.0+20260224.123157.19264 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) -db2_channel_default: v120104.0 # Default Channel version for db2u-operator -events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator) + +db2_channel_default: v110509.0 # Default Channel version for db2u-operator # Dependencies - CouchDb From d01138c91854428ec380c40c8ef96656e13ce61c Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Tue, 5 May 2026 14:33:39 -0300 Subject: [PATCH 21/21] [patch] remove trailing whitespace --- src/mas/devops/tekton.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index de00ae98..e8d03fc3 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -720,7 +720,7 @@ def prepareInstallSecrets(dynClient: DynamicClient, namespace: str, slsLicenseFi } } secretsAPI.create(body=aiserviceConfig, namespace=namespace) - + # 6. Secret/pipeline-db2-license # ------------------------------------------------------------------------- try: