diff --git a/src/mas/devops/data/catalogs/v9-260226-amd64.yaml b/src/mas/devops/data/catalogs/v9-260226-amd64.yaml index 0934090d..fee64f0d 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 # ----------------------------------------------------------------------------- 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) 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 diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index eebbbd5a..f9a3a026 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -118,6 +118,10 @@ 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 }}" + {%- endif %} {%- if db2_meta_storage_accessmode is defined and db2_meta_storage_accessmode != "" %} # Dependencies - Db2 - Access Mode diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index 6fe95be9..43180632 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -44,6 +44,10 @@ spec: # ------------------------------------------------------------------------- - name: db2_namespace 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 != "" %}