From e237048bf8dbcfc79df28a700b4ad36d5739d06b Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Thu, 3 Apr 2025 19:18:46 +0100 Subject: [PATCH 01/39] [patch] patch pending PVC for tekton postgres --- src/mas/devops/ocp.py | 49 ++++++++++++++++++++++++++++++++++++++++ src/mas/devops/tekton.py | 20 ++++++++++++++-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index 2aa9e0b9..9fa0d25a 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -157,6 +157,55 @@ def waitForDeployment(dynClient: DynamicClient, namespace: str, deploymentName: sleep(5) return foundReadyDeployment +def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: + pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") + maxRetries = 60 + foundReadyPVC = False + retries = 0 + while not foundReadyPVC and retries < maxRetries: + retries += 1 + try: + pvc = pvcAPI.get(name=pvcName, namespace=namespace) + if pvc.status.phase == "Bound": + foundReadyPVC = True + else: + logger.debug("Waiting 5s for PVC {pvcName} to be ready before checking again ...") + sleep(5) + except NotFoundError: + logger.debug("Waiting 5s for PVC {pvcName} to be created before checking again ...") + sleep(5) + return foundReadyPVC + + +def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str) -> bool: + pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") + try: + pvc = pvcAPI.get(name=pvcName, namespace=namespace) + if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None: + pvc.spec.storageClassName = storageClassName + pvcAPI.patch(body=pvc, namespace=namespace) + + maxRetries = 60 + foundReadyPVC = False + retries = 0 + while not foundReadyPVC and retries < maxRetries: + retries += 1 + try: + patchedPVC = pvcAPI.get(name=pvcName, namespace=namespace) + if patchedPVC.status.phase == "Bound": + foundReadyPVC = True + else: + logger.debug("Waiting 5s for PVC {pvcName} to be bound before checking again ...") + sleep(5) + except NotFoundError: + logger.error("The patched PVC {pvcName} does not exist.") + return False + + return foundReadyPVC + + except NotFoundError: + logger.error("PVC {pvcName} does not exist") + return False def getConsoleURL(dynClient: DynamicClient) -> str: routesAPI = dynClient.resources.get(api_version="route.openshift.io/v1", kind="Route") diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 45539d14..6d175500 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -22,7 +22,7 @@ from jinja2 import Environment, FileSystemLoader -from .ocp import getConsoleURL, waitForCRD, waitForDeployment, crdExists +from .ocp import getConsoleURL, waitForCRD, waitForDeployment, waitForPVC, patchPendingPVC, crdExists logger = logging.getLogger(__name__) @@ -79,11 +79,27 @@ def installOpenShiftPipelines(dynClient: DynamicClient) -> bool: foundReadyWebhook = waitForDeployment(dynClient, namespace="openshift-pipelines", deploymentName="tekton-pipelines-webhook") if foundReadyWebhook: logger.info("OpenShift Pipelines Webhook is installed and ready") - return True else: logger.error("OpenShift Pipelines Webhook is NOT installed and ready") return False + # Wait for the postgredb-tekton-results-postgres-0 PVC to be ready + # this PVC doesn't come up when there's no default storage class is in the cluster, + # this is causing the pvc to be in pending state and causing the tekton-results-postgres statefulSet in pending, + # due to these resources not coming up, the MAS pre-install check in the pipeline times out checking the health of this statefulSet, + # causing failure in pipeline. + # Refer https://github.com/ibm-mas/cli/issues/1511 + logger.debug("Waiting for postgredb-tekton-results-postgres-0 PVC to be ready") + foundReadyPVC = waitForPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0") + if foundReadyPVC: + logger.info("OpenShift Pipelines postgres is installed and ready") + else: + patchedPVC = patchPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0") + if patchPVC: + logger.info("OpenShift Pipelines postgres is installed and ready") + else: + logger.error("OpenShift Pipelines postgres PVC is NOT ready") + def updateTektonDefinitions(namespace: str, yamlFile: str) -> None: """ From e9a7af685e390214b17415bff13a6f92b1693675 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Fri, 4 Apr 2025 10:53:30 +0100 Subject: [PATCH 02/39] [patch] fix --- src/mas/devops/ocp.py | 12 ++++++++++-- src/mas/devops/tekton.py | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index 9fa0d25a..5cb3c9c6 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -20,6 +20,8 @@ from kubernetes.stream import stream from kubernetes.stream.ws_client import ERROR_CHANNEL +from .mas import getDefaultStorageClasses + import yaml logger = logging.getLogger(__name__) @@ -177,12 +179,18 @@ def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: return foundReadyPVC -def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str) -> bool: +def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str = None) -> bool: pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") try: pvc = pvcAPI.get(name=pvcName, namespace=namespace) if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None: - pvc.spec.storageClassName = storageClassName + if getStorageClasses is not None: + pvc.spec.storageClassName = storageClassName + else: + defaultStorageClasses = getDefaultStorageClasses(dynClient) + if defaultStorageClasses.provider is not None: + pvc.spec.storageClassName = defaultStorageClasses.rwo + pvcAPI.patch(body=pvc, namespace=namespace) maxRetries = 60 diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 6d175500..535d238a 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -27,7 +27,7 @@ logger = logging.getLogger(__name__) -def installOpenShiftPipelines(dynClient: DynamicClient) -> bool: +def installOpenShiftPipelines(dynClient: DynamicClient, customStorageClassName: str = None) -> bool: """ Install the OpenShift Pipelines Operator and wait for it to be ready to use """ @@ -94,8 +94,8 @@ def installOpenShiftPipelines(dynClient: DynamicClient) -> bool: if foundReadyPVC: logger.info("OpenShift Pipelines postgres is installed and ready") else: - patchedPVC = patchPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0") - if patchPVC: + patchedPVC = patchPendingPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0", storageClassName=customStorageClassName) + if patchedPVC: logger.info("OpenShift Pipelines postgres is installed and ready") else: logger.error("OpenShift Pipelines postgres PVC is NOT ready") From 74d0a8472335567f65770f644ec39790f1899138 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Fri, 4 Apr 2025 10:55:35 +0100 Subject: [PATCH 03/39] [patch] fix --- src/mas/devops/ocp.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index 5cb3c9c6..d57b726d 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -190,6 +190,9 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor defaultStorageClasses = getDefaultStorageClasses(dynClient) if defaultStorageClasses.provider is not None: pvc.spec.storageClassName = defaultStorageClasses.rwo + else: + logger.error("Unable to set storageClassName in PVC {pvcName}.") + return False pvcAPI.patch(body=pvc, namespace=namespace) From 5e0b4fc13fa45996d0cde3deb67097cd39da3def Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Fri, 4 Apr 2025 11:03:27 +0100 Subject: [PATCH 04/39] [patch] add comment --- src/mas/devops/tekton.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 535d238a..3ea103af 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -26,7 +26,8 @@ logger = logging.getLogger(__name__) - +# customStorageClassName is used when no default Storageclass is available on cluster, +# openshift-pipelines creates PVC which looks for default. customStorageClassName is patched into PVC when default is unavailable. def installOpenShiftPipelines(dynClient: DynamicClient, customStorageClassName: str = None) -> bool: """ Install the OpenShift Pipelines Operator and wait for it to be ready to use From 8bb2e7090e8296db5f786e7ed121f29949b0b941 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 7 Apr 2025 10:40:36 +0100 Subject: [PATCH 05/39] [patch] fix function --- src/mas/devops/ocp.py | 84 +++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index d57b726d..08358102 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -159,6 +159,47 @@ def waitForDeployment(dynClient: DynamicClient, namespace: str, deploymentName: sleep(5) return foundReadyDeployment +def getConsoleURL(dynClient: DynamicClient) -> str: + routesAPI = dynClient.resources.get(api_version="route.openshift.io/v1", kind="Route") + consoleRoute = routesAPI.get(name="console", namespace="openshift-console") + return f"https://{consoleRoute.spec.host}" + + +def getNodes(dynClient: DynamicClient) -> str: + nodesAPI = dynClient.resources.get(api_version="v1", kind="Node") + nodes = nodesAPI.get().to_dict()['items'] + return nodes + + +def getStorageClass(dynClient: DynamicClient, name: str) -> str: + try: + storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass") + storageclass = storageClassAPI.get(name=name) + return storageclass + except NotFoundError: + return None + + +def getStorageClasses(dynClient: DynamicClient) -> list: + storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass") + storageClasses = storageClassAPI.get().items + return storageClasses + + +def isSNO(dynClient: DynamicClient) -> bool: + return len(getNodes(dynClient)) == 1 + + +def crdExists(dynClient: DynamicClient, crdName: str) -> bool: + crdAPI = dynClient.resources.get(api_version="apiextensions.k8s.io/v1", kind="CustomResourceDefinition") + try: + crdAPI.get(name=crdName) + logger.debug(f"CRD does exist: {crdName}") + return True + except NotFoundError: + logger.debug(f"CRD does not exist: {crdName}") + return False + def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") maxRetries = 60 @@ -184,7 +225,7 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor try: pvc = pvcAPI.get(name=pvcName, namespace=namespace) if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None: - if getStorageClasses is not None: + if storageClassName is not None and storageClassName(dynClient, name=storageClassName) is not None: pvc.spec.storageClassName = storageClassName else: defaultStorageClasses = getDefaultStorageClasses(dynClient) @@ -218,47 +259,6 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor logger.error("PVC {pvcName} does not exist") return False -def getConsoleURL(dynClient: DynamicClient) -> str: - routesAPI = dynClient.resources.get(api_version="route.openshift.io/v1", kind="Route") - consoleRoute = routesAPI.get(name="console", namespace="openshift-console") - return f"https://{consoleRoute.spec.host}" - - -def getNodes(dynClient: DynamicClient) -> str: - nodesAPI = dynClient.resources.get(api_version="v1", kind="Node") - nodes = nodesAPI.get().to_dict()['items'] - return nodes - - -def getStorageClass(dynClient: DynamicClient, name: str) -> str: - try: - storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass") - storageclass = storageClassAPI.get(name=name) - return storageclass - except NotFoundError: - return None - - -def getStorageClasses(dynClient: DynamicClient) -> list: - storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass") - storageClasses = storageClassAPI.get().items - return storageClasses - - -def isSNO(dynClient: DynamicClient) -> bool: - return len(getNodes(dynClient)) == 1 - - -def crdExists(dynClient: DynamicClient, crdName: str) -> bool: - crdAPI = dynClient.resources.get(api_version="apiextensions.k8s.io/v1", kind="CustomResourceDefinition") - try: - crdAPI.get(name=crdName) - logger.debug(f"CRD does exist: {crdName}") - return True - except NotFoundError: - logger.debug(f"CRD does not exist: {crdName}") - return False - # Assisted by WCA@IBM # Latest GenAI contribution: ibm/granite-8b-code-instruct From f838c4e852940e377f67c4bd84ef6d7aa8833712 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 7 Apr 2025 10:48:25 +0100 Subject: [PATCH 06/39] [patch] moved functions to mas.py --- src/mas/devops/mas.py | 60 +++++++++++++++++++++++++++++++++++++++ src/mas/devops/ocp.py | 61 ---------------------------------------- src/mas/devops/tekton.py | 3 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index 2bb18640..f405278d 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -12,6 +12,7 @@ import re import yaml from os import path +from time import sleep from types import SimpleNamespace from kubernetes.dynamic.resource import ResourceInstance from openshift.dynamic import DynamicClient @@ -194,3 +195,62 @@ def updateIBMEntitlementKey(dynClient: DynamicClient, namespace: str, icrUsernam secret = secretsAPI.apply(body=secret, namespace=namespace) return secret + +def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: + pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") + maxRetries = 60 + foundReadyPVC = False + retries = 0 + while not foundReadyPVC and retries < maxRetries: + retries += 1 + try: + pvc = pvcAPI.get(name=pvcName, namespace=namespace) + if pvc.status.phase == "Bound": + foundReadyPVC = True + else: + logger.debug("Waiting 5s for PVC {pvcName} to be ready before checking again ...") + sleep(5) + except NotFoundError: + logger.debug("Waiting 5s for PVC {pvcName} to be created before checking again ...") + sleep(5) + return foundReadyPVC + + +def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str = None) -> bool: + pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") + try: + pvc = pvcAPI.get(name=pvcName, namespace=namespace) + if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None: + if storageClassName is not None and storageClassName(dynClient, name=storageClassName) is not None: + pvc.spec.storageClassName = storageClassName + else: + defaultStorageClasses = getDefaultStorageClasses(dynClient) + if defaultStorageClasses.provider is not None: + pvc.spec.storageClassName = defaultStorageClasses.rwo + else: + logger.error("Unable to set storageClassName in PVC {pvcName}.") + return False + + pvcAPI.patch(body=pvc, namespace=namespace) + + maxRetries = 60 + foundReadyPVC = False + retries = 0 + while not foundReadyPVC and retries < maxRetries: + retries += 1 + try: + patchedPVC = pvcAPI.get(name=pvcName, namespace=namespace) + if patchedPVC.status.phase == "Bound": + foundReadyPVC = True + else: + logger.debug("Waiting 5s for PVC {pvcName} to be bound before checking again ...") + sleep(5) + except NotFoundError: + logger.error("The patched PVC {pvcName} does not exist.") + return False + + return foundReadyPVC + + except NotFoundError: + logger.error("PVC {pvcName} does not exist") + return False diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index 08358102..ff7b5c28 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -20,8 +20,6 @@ from kubernetes.stream import stream from kubernetes.stream.ws_client import ERROR_CHANNEL -from .mas import getDefaultStorageClasses - import yaml logger = logging.getLogger(__name__) @@ -200,65 +198,6 @@ def crdExists(dynClient: DynamicClient, crdName: str) -> bool: logger.debug(f"CRD does not exist: {crdName}") return False -def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: - pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") - maxRetries = 60 - foundReadyPVC = False - retries = 0 - while not foundReadyPVC and retries < maxRetries: - retries += 1 - try: - pvc = pvcAPI.get(name=pvcName, namespace=namespace) - if pvc.status.phase == "Bound": - foundReadyPVC = True - else: - logger.debug("Waiting 5s for PVC {pvcName} to be ready before checking again ...") - sleep(5) - except NotFoundError: - logger.debug("Waiting 5s for PVC {pvcName} to be created before checking again ...") - sleep(5) - return foundReadyPVC - - -def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str = None) -> bool: - pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") - try: - pvc = pvcAPI.get(name=pvcName, namespace=namespace) - if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None: - if storageClassName is not None and storageClassName(dynClient, name=storageClassName) is not None: - pvc.spec.storageClassName = storageClassName - else: - defaultStorageClasses = getDefaultStorageClasses(dynClient) - if defaultStorageClasses.provider is not None: - pvc.spec.storageClassName = defaultStorageClasses.rwo - else: - logger.error("Unable to set storageClassName in PVC {pvcName}.") - return False - - pvcAPI.patch(body=pvc, namespace=namespace) - - maxRetries = 60 - foundReadyPVC = False - retries = 0 - while not foundReadyPVC and retries < maxRetries: - retries += 1 - try: - patchedPVC = pvcAPI.get(name=pvcName, namespace=namespace) - if patchedPVC.status.phase == "Bound": - foundReadyPVC = True - else: - logger.debug("Waiting 5s for PVC {pvcName} to be bound before checking again ...") - sleep(5) - except NotFoundError: - logger.error("The patched PVC {pvcName} does not exist.") - return False - - return foundReadyPVC - - except NotFoundError: - logger.error("PVC {pvcName} does not exist") - return False - # Assisted by WCA@IBM # Latest GenAI contribution: ibm/granite-8b-code-instruct diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 3ea103af..215af931 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -22,7 +22,8 @@ from jinja2 import Environment, FileSystemLoader -from .ocp import getConsoleURL, waitForCRD, waitForDeployment, waitForPVC, patchPendingPVC, crdExists +from .ocp import getConsoleURL, waitForCRD, waitForDeployment, crdExists +from .mas import waitForPVC, patchPendingPVC logger = logging.getLogger(__name__) From 627794c36aeb6107ab5e8cccc9236995b682ac4c Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 7 Apr 2025 10:56:11 +0100 Subject: [PATCH 07/39] [patch] fix whitespace --- src/mas/devops/tekton.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 215af931..799d4420 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -86,10 +86,10 @@ def installOpenShiftPipelines(dynClient: DynamicClient, customStorageClassName: return False # Wait for the postgredb-tekton-results-postgres-0 PVC to be ready - # this PVC doesn't come up when there's no default storage class is in the cluster, - # this is causing the pvc to be in pending state and causing the tekton-results-postgres statefulSet in pending, + # this PVC doesn't come up when there's no default storage class is in the cluster, + # this is causing the pvc to be in pending state and causing the tekton-results-postgres statefulSet in pending, # due to these resources not coming up, the MAS pre-install check in the pipeline times out checking the health of this statefulSet, - # causing failure in pipeline. + # causing failure in pipeline. # Refer https://github.com/ibm-mas/cli/issues/1511 logger.debug("Waiting for postgredb-tekton-results-postgres-0 PVC to be ready") foundReadyPVC = waitForPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0") From 1a2e1c66f185aa31f61dfe1217d4bff79b371033 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 7 Apr 2025 11:02:08 +0100 Subject: [PATCH 08/39] [patch] fix precommit errors --- src/mas/devops/mas.py | 2 ++ src/mas/devops/ocp.py | 1 + src/mas/devops/tekton.py | 1 + 3 files changed, 4 insertions(+) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index f405278d..b6d97612 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -196,6 +196,7 @@ def updateIBMEntitlementKey(dynClient: DynamicClient, namespace: str, icrUsernam secret = secretsAPI.apply(body=secret, namespace=namespace) return secret + def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim") maxRetries = 60 @@ -213,6 +214,7 @@ def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: except NotFoundError: logger.debug("Waiting 5s for PVC {pvcName} to be created before checking again ...") sleep(5) + return foundReadyPVC diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index ff7b5c28..2aa9e0b9 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -157,6 +157,7 @@ def waitForDeployment(dynClient: DynamicClient, namespace: str, deploymentName: sleep(5) return foundReadyDeployment + def getConsoleURL(dynClient: DynamicClient) -> str: routesAPI = dynClient.resources.get(api_version="route.openshift.io/v1", kind="Route") consoleRoute = routesAPI.get(name="console", namespace="openshift-console") diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 799d4420..4f561aec 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -27,6 +27,7 @@ logger = logging.getLogger(__name__) + # customStorageClassName is used when no default Storageclass is available on cluster, # openshift-pipelines creates PVC which looks for default. customStorageClassName is patched into PVC when default is unavailable. def installOpenShiftPipelines(dynClient: DynamicClient, customStorageClassName: str = None) -> bool: From 2879ef45b29eb3d33bd15bdd645467272dcbf83a Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 7 Apr 2025 11:05:45 +0100 Subject: [PATCH 09/39] [patch] fix whitespace --- src/mas/devops/mas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index b6d97612..bca104ab 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -250,7 +250,7 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor except NotFoundError: logger.error("The patched PVC {pvcName} does not exist.") return False - + return foundReadyPVC except NotFoundError: From 907c62976260d941528d725cc6d52cc54ac7a2bc Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 7 Apr 2025 11:14:20 +0100 Subject: [PATCH 10/39] [patch] return value for installOpenShiftPipelines --- src/mas/devops/tekton.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 4f561aec..e97811b0 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -96,12 +96,15 @@ def installOpenShiftPipelines(dynClient: DynamicClient, customStorageClassName: foundReadyPVC = waitForPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0") if foundReadyPVC: logger.info("OpenShift Pipelines postgres is installed and ready") + return True else: patchedPVC = patchPendingPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0", storageClassName=customStorageClassName) if patchedPVC: logger.info("OpenShift Pipelines postgres is installed and ready") + return True else: logger.error("OpenShift Pipelines postgres PVC is NOT ready") + return False def updateTektonDefinitions(namespace: str, yamlFile: str) -> None: From 5772b27c81ec422cfab8c7a13a35e0f7e0936c9d Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Mon, 7 Apr 2025 15:45:10 +0530 Subject: [PATCH 11/39] [patch] may patch prep --- .../devops/data/catalogs/v9-250501-amd64.yaml | 110 ++++++++++++++++++ .../devops/data/catalogs/v9-250501-s390x.yaml | 40 +++++++ test/src/test_data.py | 2 +- 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 src/mas/devops/data/catalogs/v9-250501-amd64.yaml create mode 100644 src/mas/devops/data/catalogs/v9-250501-s390x.yaml diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml new file mode 100644 index 00000000..b232cf0b --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -0,0 +1,110 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250403 +# ----------------------------------------------------------------------------- +# In the future this won't be necessary as we'll be able to mirror from the +# catalog itself, but not everything in the catalog supports this yet (including MAS) +# so we need to use the CASE bundle mirror process still. + +catalog_digest: sha256:b514c75a2fa0bf4c31dad913e9e2088989a47f30c91a4310abee257c6820f5d1 + +# Dependencies +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.12 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) +common_svcs_version: 4.7.0 # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0 # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +common_svcs_version_2: 4.8.0 +common_svcs_version_1: 4.3.0 #+20240702.100000 # common_svcs is a mess + +cp4d_platform_version: 5.0.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) + +ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explicitily mirrored + +db2u_version: 6.0.1+20240704.142950.9960 # Operator version 110509.0.2 to find the version 6.0.1, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +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.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.6.2 # Updated # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +dd_version: 1.1.17 # updated # Operator version 1.1.14 (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: 9.0.0 # Operator version 9.0.0 +wml_version: 9.0.0 # Operator version 5.0.0 +# ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version +# datarefinery_build: +20240517.202103.146 +spark_version: 9.0.0 # Operator version 5.0.0 +cognos_version: 25.0.0 # Operator version 25.0.0 +couchdb_version: 1.0.13 # Operator version 2.2.1 (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.2570 # Operator version 1.1.2470 + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0-pre.stable_8193 # No Update + 9.0.x: 9.0.10 # updated + 8.10.x: 8.10.24 # updated + 8.11.x: 8.11.21 # updated +mas_assist_version: + 9.0.x: 9.0.4 # No Update + 8.10.x: 8.7.8 # No Update + 8.11.x: 8.8.7 # No Update +mas_hputilities_version: + 9.0.x: "" # Not Supported + 8.10.x: 8.6.7 # tbc + 8.11.x: "" # Not Supported +mas_iot_version: + 9.0.x: 9.0.7 # updated + 8.10.x: 8.7.21 # updated + 8.11.x: 8.8.17 # updated +mas_manage_version: + 9.1.x-feature: 9.1.0-pre.stable_9992 # No Update + 9.0.x: 9.0.11 # updated + 8.10.x: 8.6.24 # updated + 8.11.x: 8.7.18 # updated +mas_monitor_version: + 9.0.x: 9.0.8 # updated + 8.10.x: 8.10.18 # updated + 8.11.x: 8.11.16 # updated +mas_optimizer_version: + 9.1.x-feature: 9.1.0-pre.stable_1813 # No Update + 9.0.x: 9.0.9 # updated + 8.10.x: 8.4.16 # updated + 8.11.x: 8.5.15 # updated +mas_predict_version: + 9.0.x: 9.0.6 # updated + 8.10.x: 8.8.7 # updated + 8.11.x: 8.9.9 # updated +mas_visualinspection_version: + 9.1.x-feature: 9.1.0-pre.stable_2246 # No Update + 9.0.x: 9.0.8 # updated + 8.10.x: 8.8.4 # No Update + 8.11.x: 8.9.11 # updated + +# Extra Images for UDS +# ------------------------------------------------------------------------------ +uds_extras_version: 1.5.0 + +# Extra Images for Mongo +# ------------------------------------------------------------------------------ +mongo_extras_version_default: 7.0.12 + +# Variables used to mirror additional mongo image versions +mongo_extras_version_4: 4.4.21 +mongo_extras_version_5: 5.0.23 +mongo_extras_version_6: 6.0.12 +mongo_extras_version_7: 7.0.12 + +# Extra Images for Db2u +# ------------------------------------------------------------------------------ +db2u_extras_version: 1.0.6 # No Update +db2u_filter: db2 + +# Extra Images for IBM Watson Discovery +# ------------------------------------------------------------------------------ +#wd_extras_version: 1.0.4 + +# Extra Images for Amlen +# ------------------------------------------------------------------------------ +amlen_extras_version: 1.1.2 + +# Default Cloud Pak for Data version +# ------------------------------------------------------------------------------ +cpd_product_version_default: 5.0.0 diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml new file mode 100644 index 00000000..1f1bf0df --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -0,0 +1,40 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250403 +# ----------------------------------------------------------------------------- +# In the future this won't be necessary as we'll be able to mirror from the +# catalog itself, but not everything in the catalog supports this yet (including MAS) +# so we need to use the CASE bundle mirror process still. + +catalog_digest: sha256:45f4a5de29d15b936399adc28a80258557420094f1f7740c97e8d44a84446a85 + +uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change +sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.6.1 # No Update # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0-pre.stable_8193 # tbc + 9.0.x: 9.0.10 # updated + 8.10.x: "" # Not Supported + 8.11.x: "" # Not Supported +mas_manage_version: + 9.1.x-feature: 9.1.0-pre.stable_9992 # tbc + 9.0.x: 9.0.11 # updated + 8.10.x: "" # Not Supported + 8.11.x: "" # Not Supported + +# Extra Images for UDS +# ------------------------------------------------------------------------------ +uds_extras_version: 1.5.0 + +# Extra Images for Mongo +# ------------------------------------------------------------------------------ +mongo_extras_version_default: 7.0.12 + +# Variables used to mirror additional mongo image versions +mongo_extras_version_4: 4.4.21 +mongo_extras_version_5: 5.0.23 +mongo_extras_version_6: 6.0.12 +mongo_extras_version_7: 7.0.12 diff --git a/test/src/test_data.py b/test/src/test_data.py index ffec3890..f45d8943 100644 --- a/test/src/test_data.py +++ b/test/src/test_data.py @@ -26,7 +26,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! - assert catalogTag == "v9-250403-amd64" + assert catalogTag == "v9-250501-amd64" def test_get_newest_catalog_tag_fail(): From 01560bf330064659608ef9e932a765a2d8cb4cdb Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Wed, 9 Apr 2025 18:14:27 +0530 Subject: [PATCH 12/39] [patch] v9-250501-amd64.yaml file updated --- .../devops/data/catalogs/v9-250501-amd64.yaml | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index b232cf0b..8bb22c62 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -21,9 +21,9 @@ ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explic db2u_version: 6.0.1+20240704.142950.9960 # Operator version 110509.0.2 to find the version 6.0.1, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) 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.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) -tsm_version: 1.6.2 # Updated # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) -dd_version: 1.1.17 # updated # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) +sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.6.2 # tbc # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +dd_version: 1.1.17 # tbc # Operator version 1.1.14 (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: 9.0.0 # Operator version 9.0.0 wml_version: 9.0.0 # Operator version 5.0.0 @@ -39,9 +39,9 @@ elasticsearch_version: 1.1.2570 # Operator version 1.1.2470 # ----------------------------------------------------------------------------- mas_core_version: 9.1.x-feature: 9.1.0-pre.stable_8193 # No Update - 9.0.x: 9.0.10 # updated - 8.10.x: 8.10.24 # updated - 8.11.x: 8.11.21 # updated + 9.0.x: 9.0.10 # tbc + 8.10.x: 8.10.24 # tbc + 8.11.x: 8.11.21 # tbc mas_assist_version: 9.0.x: 9.0.4 # No Update 8.10.x: 8.7.8 # No Update @@ -51,32 +51,32 @@ mas_hputilities_version: 8.10.x: 8.6.7 # tbc 8.11.x: "" # Not Supported mas_iot_version: - 9.0.x: 9.0.7 # updated - 8.10.x: 8.7.21 # updated - 8.11.x: 8.8.17 # updated + 9.0.x: 9.0.7 # tbc + 8.10.x: 8.7.21 # tbc + 8.11.x: 8.8.17 # tbc mas_manage_version: 9.1.x-feature: 9.1.0-pre.stable_9992 # No Update - 9.0.x: 9.0.11 # updated - 8.10.x: 8.6.24 # updated - 8.11.x: 8.7.18 # updated + 9.0.x: 9.0.11 # tbc + 8.10.x: 8.6.24 # tbc + 8.11.x: 8.7.18 # tbc mas_monitor_version: - 9.0.x: 9.0.8 # updated - 8.10.x: 8.10.18 # updated - 8.11.x: 8.11.16 # updated + 9.0.x: 9.0.8 # tbc + 8.10.x: 8.10.18 # tbc + 8.11.x: 8.11.16 # tbc mas_optimizer_version: 9.1.x-feature: 9.1.0-pre.stable_1813 # No Update - 9.0.x: 9.0.9 # updated - 8.10.x: 8.4.16 # updated - 8.11.x: 8.5.15 # updated + 9.0.x: 9.0.9 # tbc + 8.10.x: 8.4.16 # tbc + 8.11.x: 8.5.15 # tbc mas_predict_version: - 9.0.x: 9.0.6 # updated - 8.10.x: 8.8.7 # updated - 8.11.x: 8.9.9 # updated + 9.0.x: 9.0.6 # tbc + 8.10.x: 8.8.7 # tbc + 8.11.x: 8.9.9 # tbc mas_visualinspection_version: 9.1.x-feature: 9.1.0-pre.stable_2246 # No Update - 9.0.x: 9.0.8 # updated + 9.0.x: 9.0.8 # tbc 8.10.x: 8.8.4 # No Update - 8.11.x: 8.9.11 # updated + 8.11.x: 8.9.11 # tbc # Extra Images for UDS # ------------------------------------------------------------------------------ From 2d5077fd2ead3a506e1917694ec928458b7eb772 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Wed, 9 Apr 2025 18:21:36 +0530 Subject: [PATCH 13/39] [patch] v9-250501-s390x.yaml file updated --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 1f1bf0df..655fb7d8 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:45f4a5de29d15b936399adc28a80258557420094f1f7740c97e8d44a84446a85 +catalog_digest: tbc uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -16,12 +16,12 @@ tsm_version: 1.6.1 # No Update # Operator version 1.5.4 (https://g # ----------------------------------------------------------------------------- mas_core_version: 9.1.x-feature: 9.1.0-pre.stable_8193 # tbc - 9.0.x: 9.0.10 # updated + 9.0.x: 9.0.10 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported mas_manage_version: 9.1.x-feature: 9.1.0-pre.stable_9992 # tbc - 9.0.x: 9.0.11 # updated + 9.0.x: 9.0.11 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported From 8c2e3d387d386584eb9cb8d2b8239d72c748c606 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 10 Apr 2025 14:58:28 +0530 Subject: [PATCH 14/39] [patch] add digest --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 8bb22c62..c0889404 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:b514c75a2fa0bf4c31dad913e9e2088989a47f30c91a4310abee257c6820f5d1 +catalog_digest: sha256:47c92c48c5da0ad9c4e98d6dce31095fe33a77d642bc5622b6685773cf8594f5 # Dependencies # ----------------------------------------------------------------------------- From 0898f032d875975dd0d31fb465fc58dd60eccec6 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Tue, 15 Apr 2025 08:21:43 +0530 Subject: [PATCH 15/39] [patch] catalog tag updated --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 2 +- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index c0889404..9b4f8f57 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -1,5 +1,5 @@ --- -# Case bundle configuration for IBM Maximo Operator Catalog 250403 +# Case bundle configuration for IBM Maximo Operator Catalog 250501 # ----------------------------------------------------------------------------- # In the future this won't be necessary as we'll be able to mirror from the # catalog itself, but not everything in the catalog supports this yet (including MAS) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 655fb7d8..2afb317f 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -1,5 +1,5 @@ --- -# Case bundle configuration for IBM Maximo Operator Catalog 250403 +# Case bundle configuration for IBM Maximo Operator Catalog 250501 # ----------------------------------------------------------------------------- # In the future this won't be necessary as we'll be able to mirror from the # catalog itself, but not everything in the catalog supports this yet (including MAS) From 67c8840f86fab19e738e20b82887a651cbb49e55 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 16 Apr 2025 11:29:18 +0530 Subject: [PATCH 16/39] [patch] set cpd 5.1 --- .../devops/data/catalogs/v9-250501-amd64.yaml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 9b4f8f57..10755342 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -10,13 +10,11 @@ catalog_digest: sha256:47c92c48c5da0ad9c4e98d6dce31095fe33a77d642bc5622b6685773c # Dependencies # ----------------------------------------------------------------------------- ibm_licensing_version: 4.2.12 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) -common_svcs_version: 4.7.0 # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0 # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) -common_svcs_version_2: 4.8.0 -common_svcs_version_1: 4.3.0 #+20240702.100000 # common_svcs is a mess +common_svcs_version: 4.10.0 # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0 # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) -cp4d_platform_version: 5.0.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) +cp4d_platform_version: 5.1.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) -ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explicitily mirrored +ibm_zen_version: 6.1.0+20241120.004836.207 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 6.0.1+20240704.142950.9960 # Operator version 110509.0.2 to find the version 6.0.1, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator) @@ -25,12 +23,12 @@ sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https:// tsm_version: 1.6.2 # tbc # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) dd_version: 1.1.17 # tbc # Operator version 1.1.14 (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: 9.0.0 # Operator version 9.0.0 -wml_version: 9.0.0 # Operator version 5.0.0 +wsl_version: 10.0.0 +wml_version: 10.0.0 # ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version # datarefinery_build: +20240517.202103.146 -spark_version: 9.0.0 # Operator version 5.0.0 -cognos_version: 25.0.0 # Operator version 25.0.0 +spark_version: 10.0.0 # Operator version 5.0.0 +cognos_version: 27.0.0 # Operator version 25.0.0 couchdb_version: 1.0.13 # Operator version 2.2.1 (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.2570 # Operator version 1.1.2470 @@ -107,4 +105,4 @@ amlen_extras_version: 1.1.2 # Default Cloud Pak for Data version # ------------------------------------------------------------------------------ -cpd_product_version_default: 5.0.0 +cpd_product_version_default: 5.1.0 From 213b5720d2dd0ab15aeff5fed94b432807e58eef Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 17 Apr 2025 14:47:05 +0530 Subject: [PATCH 17/39] [patch] update s390x: tsm_version: 1.6.2 catalog_digest: sha256:3e54f36aa4bac7c0ee2be788cb8e00153a1c066a19a4734e624503ef39c03777 --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 2afb317f..d7a70f9a 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,11 +5,11 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: tbc +catalog_digest: sha256:3e54f36aa4bac7c0ee2be788cb8e00153a1c066a19a4734e624503ef39c03777 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) -tsm_version: 1.6.1 # No Update # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +tsm_version: 1.6.2 # No Update # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) # Maximo Application Suite From 0f20b090f90fd4292fda936dfad12311808120c7 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 22 Apr 2025 23:39:44 +0530 Subject: [PATCH 18/39] [patch] update amd64: catalog_digest: sha256:6652ba9de686c61c4bb41c89ad1b0ed4d4073ec130cf609a11d3133014f1f187 --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 10755342..8c2b5229 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:47c92c48c5da0ad9c4e98d6dce31095fe33a77d642bc5622b6685773cf8594f5 +catalog_digest: sha256:6652ba9de686c61c4bb41c89ad1b0ed4d4073ec130cf609a11d3133014f1f187 # Dependencies # ----------------------------------------------------------------------------- From 347153dcec55be1909a7c9c1e14ec6b552212374 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 22 Apr 2025 23:39:46 +0530 Subject: [PATCH 19/39] [patch] update s390x: catalog_digest: sha256:3108d9fcab4e7cbc622af4fc16d2d7f476b4bb18a21b6d25376badbda3f6dfdc --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index d7a70f9a..e0f6a2b3 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:3e54f36aa4bac7c0ee2be788cb8e00153a1c066a19a4734e624503ef39c03777 +catalog_digest: sha256:3108d9fcab4e7cbc622af4fc16d2d7f476b4bb18a21b6d25376badbda3f6dfdc uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From 5a49fe86c387ce30d15886e3b821dff0201bcce1 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 23 Apr 2025 00:29:00 +0530 Subject: [PATCH 20/39] [patch] update amd64: catalog_digest: sha256:61d2174bb39c102179b923af37e2555aca488520ede60d4516e8f8ed1e204752 --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 8c2b5229..1f2e5d01 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:6652ba9de686c61c4bb41c89ad1b0ed4d4073ec130cf609a11d3133014f1f187 +catalog_digest: sha256:61d2174bb39c102179b923af37e2555aca488520ede60d4516e8f8ed1e204752 # Dependencies # ----------------------------------------------------------------------------- From e498e1d67eeeed90d44d386710c9d666d64c4fcb Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 23 Apr 2025 00:29:02 +0530 Subject: [PATCH 21/39] [patch] update s390x: catalog_digest: sha256:07eb918b45ccd94c36daf5b9aa2d4b7d287b8fe3f75fa47813216b181d98ae7d --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index e0f6a2b3..3c561c05 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:3108d9fcab4e7cbc622af4fc16d2d7f476b4bb18a21b6d25376badbda3f6dfdc +catalog_digest: sha256:07eb918b45ccd94c36daf5b9aa2d4b7d287b8fe3f75fa47813216b181d98ae7d uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From 3896e116b11585d783cc6204d45e66fc64eb1f93 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 23 Apr 2025 00:30:04 +0530 Subject: [PATCH 22/39] [patch] update amd64: dd_version: 1.1.18 mas_monitor_version: 9.0.9,8.10.19,8.11.17 mas_optimizer_version: 9.0.10,8.4.17,8.5.16 mas_predict_version: 9.0.7,8.8.8,8.9.10 mas_visualinspection_version: 9.0.9,8.9.12Digest catalog_digest: 9.0.9,8.9.12 --- .../devops/data/catalogs/v9-250501-amd64.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 1f2e5d01..62bed953 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -21,7 +21,7 @@ events_version: 5.0.1 # Operator version 5.0.1 (https://g uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) tsm_version: 1.6.2 # tbc # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) -dd_version: 1.1.17 # tbc # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) +dd_version: 1.1.18 # tbc # Operator version 1.1.14 (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: 10.0.0 wml_version: 10.0.0 @@ -58,23 +58,23 @@ mas_manage_version: 8.10.x: 8.6.24 # tbc 8.11.x: 8.7.18 # tbc mas_monitor_version: - 9.0.x: 9.0.8 # tbc - 8.10.x: 8.10.18 # tbc - 8.11.x: 8.11.16 # tbc + 9.0.x: 9.0.9 # tbc + 8.10.x: 8.10.19 # tbc + 8.11.x: 8.11.17 # tbc mas_optimizer_version: 9.1.x-feature: 9.1.0-pre.stable_1813 # No Update - 9.0.x: 9.0.9 # tbc - 8.10.x: 8.4.16 # tbc - 8.11.x: 8.5.15 # tbc + 9.0.x: 9.0.10 # tbc + 8.10.x: 8.4.17 # tbc + 8.11.x: 8.5.16 # tbc mas_predict_version: - 9.0.x: 9.0.6 # tbc - 8.10.x: 8.8.7 # tbc - 8.11.x: 8.9.9 # tbc + 9.0.x: 9.0.7 # tbc + 8.10.x: 8.8.8 # tbc + 8.11.x: 8.9.10 # tbc mas_visualinspection_version: 9.1.x-feature: 9.1.0-pre.stable_2246 # No Update - 9.0.x: 9.0.8 # tbc + 9.0.x: 9.0.9 # tbc 8.10.x: 8.8.4 # No Update - 8.11.x: 8.9.11 # tbc + 8.11.x: 8.9.12 # tbc # Extra Images for UDS # ------------------------------------------------------------------------------ From 9381a55d4fd552a0bfbcdad32c7936bbe7308e5c Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 23 Apr 2025 12:37:34 +0530 Subject: [PATCH 23/39] [patch] fix logger message formating --- src/mas/devops/mas.py | 16 ++++++++-------- src/mas/devops/ocp.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index bca104ab..1d1e184f 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -146,8 +146,8 @@ def verifyMasInstance(dynClient: DynamicClient, instanceId: str) -> bool: except ResourceNotFoundError: # The MAS Suite CRD has not even been installed in the cluster return False - except UnauthorizedError: - logger.error("Error: Unable to verify MAS instance due to failed authorization: {e}") + except UnauthorizedError as e: + logger.error(f"Error: Unable to verify MAS instance due to failed authorization: {e}") return False @@ -209,10 +209,10 @@ def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool: if pvc.status.phase == "Bound": foundReadyPVC = True else: - logger.debug("Waiting 5s for PVC {pvcName} to be ready before checking again ...") + logger.debug(f"Waiting 5s for PVC {pvcName} to be ready before checking again ...") sleep(5) except NotFoundError: - logger.debug("Waiting 5s for PVC {pvcName} to be created before checking again ...") + logger.debug(f"Waiting 5s for PVC {pvcName} to be created before checking again ...") sleep(5) return foundReadyPVC @@ -230,7 +230,7 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor if defaultStorageClasses.provider is not None: pvc.spec.storageClassName = defaultStorageClasses.rwo else: - logger.error("Unable to set storageClassName in PVC {pvcName}.") + logger.error(f"Unable to set storageClassName in PVC {pvcName}.") return False pvcAPI.patch(body=pvc, namespace=namespace) @@ -245,14 +245,14 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor if patchedPVC.status.phase == "Bound": foundReadyPVC = True else: - logger.debug("Waiting 5s for PVC {pvcName} to be bound before checking again ...") + logger.debug(f"Waiting 5s for PVC {pvcName} to be bound before checking again ...") sleep(5) except NotFoundError: - logger.error("The patched PVC {pvcName} does not exist.") + logger.error(f"The patched PVC {pvcName} does not exist.") return False return foundReadyPVC except NotFoundError: - logger.error("PVC {pvcName} does not exist") + logger.error(f"PVC {pvcName} does not exist") return False diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py index 2aa9e0b9..e4c54113 100644 --- a/src/mas/devops/ocp.py +++ b/src/mas/devops/ocp.py @@ -150,10 +150,10 @@ def waitForDeployment(dynClient: DynamicClient, namespace: str, deploymentName: # NoneType and int comparison TypeError foundReadyDeployment = True else: - logger.debug("Waiting 5s for deployment {deploymentName} to be ready before checking again ...") + logger.debug(f"Waiting 5s for deployment {deploymentName} to be ready before checking again ...") sleep(5) except NotFoundError: - logger.debug("Waiting 5s for deployment {deploymentName} to be created before checking again ...") + logger.debug(f"Waiting 5s for deployment {deploymentName} to be created before checking again ...") sleep(5) return foundReadyDeployment From c6794a7deec39a007a159d4a72aac231fb7fa31f Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 24 Apr 2025 00:40:38 +0530 Subject: [PATCH 24/39] [patch] update amd64: mas_core_version: 8.10.25,8.11.22 mas_assist_version: 9.0.5 mas_iot_version: 9.0.8,8.7.22,8.8.18 mas_manage_version: 9.0.12,8.6.25,8.7.19 mas_visualinspection_version: 9.1.0-pre.stable_2405 catalog_digest: sha256:6a34de6e00791707056512e0f60575ce3391efdb1fc140188c27cc843b60437b --- .../devops/data/catalogs/v9-250501-amd64.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 62bed953..66046449 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:61d2174bb39c102179b923af37e2555aca488520ede60d4516e8f8ed1e204752 +catalog_digest: sha256:6a34de6e00791707056512e0f60575ce3391efdb1fc140188c27cc843b60437b # Dependencies # ----------------------------------------------------------------------------- @@ -38,10 +38,10 @@ elasticsearch_version: 1.1.2570 # Operator version 1.1.2470 mas_core_version: 9.1.x-feature: 9.1.0-pre.stable_8193 # No Update 9.0.x: 9.0.10 # tbc - 8.10.x: 8.10.24 # tbc - 8.11.x: 8.11.21 # tbc + 8.10.x: 8.10.25 # tbc + 8.11.x: 8.11.22 # tbc mas_assist_version: - 9.0.x: 9.0.4 # No Update + 9.0.x: 9.0.5 # No Update 8.10.x: 8.7.8 # No Update 8.11.x: 8.8.7 # No Update mas_hputilities_version: @@ -49,14 +49,14 @@ mas_hputilities_version: 8.10.x: 8.6.7 # tbc 8.11.x: "" # Not Supported mas_iot_version: - 9.0.x: 9.0.7 # tbc - 8.10.x: 8.7.21 # tbc - 8.11.x: 8.8.17 # tbc + 9.0.x: 9.0.8 # tbc + 8.10.x: 8.7.22 # tbc + 8.11.x: 8.8.18 # tbc mas_manage_version: 9.1.x-feature: 9.1.0-pre.stable_9992 # No Update - 9.0.x: 9.0.11 # tbc - 8.10.x: 8.6.24 # tbc - 8.11.x: 8.7.18 # tbc + 9.0.x: 9.0.12 # tbc + 8.10.x: 8.6.25 # tbc + 8.11.x: 8.7.19 # tbc mas_monitor_version: 9.0.x: 9.0.9 # tbc 8.10.x: 8.10.19 # tbc @@ -71,7 +71,7 @@ mas_predict_version: 8.10.x: 8.8.8 # tbc 8.11.x: 8.9.10 # tbc mas_visualinspection_version: - 9.1.x-feature: 9.1.0-pre.stable_2246 # No Update + 9.1.x-feature: 9.1.0-pre.stable_2405 # No Update 9.0.x: 9.0.9 # tbc 8.10.x: 8.8.4 # No Update 8.11.x: 8.9.12 # tbc From e3b8873a25056af61c85eabe0c4c2a5cc9c723e1 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 24 Apr 2025 00:40:40 +0530 Subject: [PATCH 25/39] [patch] update s390x: mas_manage_version: 9.0.12 catalog_digest: sha256:76c9c49e45cf9e52ae42f8eb214dabc1e9e8dd79037e8d6eeea2b200fce86dea --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 3c561c05..1447e432 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:07eb918b45ccd94c36daf5b9aa2d4b7d287b8fe3f75fa47813216b181d98ae7d +catalog_digest: sha256:76c9c49e45cf9e52ae42f8eb214dabc1e9e8dd79037e8d6eeea2b200fce86dea uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -21,7 +21,7 @@ mas_core_version: 8.11.x: "" # Not Supported mas_manage_version: 9.1.x-feature: 9.1.0-pre.stable_9992 # tbc - 9.0.x: 9.0.11 # tbc + 9.0.x: 9.0.12 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported From 343e7b5272462e8db773dac700e97d1a3d56c241 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 24 Apr 2025 17:50:59 +0530 Subject: [PATCH 26/39] Revert "[patch] set cpd 5.1" This reverts commit 67c8840f86fab19e738e20b82887a651cbb49e55. --- .../devops/data/catalogs/v9-250501-amd64.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 66046449..6d230525 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -10,11 +10,13 @@ catalog_digest: sha256:6a34de6e00791707056512e0f60575ce3391efdb1fc140188c27cc843 # Dependencies # ----------------------------------------------------------------------------- ibm_licensing_version: 4.2.12 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) -common_svcs_version: 4.10.0 # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0 # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +common_svcs_version: 4.7.0 # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0 # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +common_svcs_version_2: 4.8.0 +common_svcs_version_1: 4.3.0 #+20240702.100000 # common_svcs is a mess -cp4d_platform_version: 5.1.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) +cp4d_platform_version: 5.0.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) -ibm_zen_version: 6.1.0+20241120.004836.207 # For CPD5 ibm-zen has to be explicitily mirrored +ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explicitily mirrored db2u_version: 6.0.1+20240704.142950.9960 # Operator version 110509.0.2 to find the version 6.0.1, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator) @@ -23,12 +25,12 @@ sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https:// tsm_version: 1.6.2 # tbc # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) dd_version: 1.1.18 # tbc # Operator version 1.1.14 (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: 10.0.0 -wml_version: 10.0.0 +wsl_version: 9.0.0 # Operator version 9.0.0 +wml_version: 9.0.0 # Operator version 5.0.0 # ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version # datarefinery_build: +20240517.202103.146 -spark_version: 10.0.0 # Operator version 5.0.0 -cognos_version: 27.0.0 # Operator version 25.0.0 +spark_version: 9.0.0 # Operator version 5.0.0 +cognos_version: 25.0.0 # Operator version 25.0.0 couchdb_version: 1.0.13 # Operator version 2.2.1 (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.2570 # Operator version 1.1.2470 @@ -105,4 +107,4 @@ amlen_extras_version: 1.1.2 # Default Cloud Pak for Data version # ------------------------------------------------------------------------------ -cpd_product_version_default: 5.1.0 +cpd_product_version_default: 5.0.0 From 36829de76fb6c3f167e99ce79ba8a8d26750d41a Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 24 Apr 2025 18:24:17 +0530 Subject: [PATCH 27/39] [patch] update amd64: mas_core_version: 9.0.11 catalog_digest: sha256:cfc8151b42a8d705ee68024897afe4224e5a1cae9249dc09188c4b2e5b7c77bb --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 6d230525..05cb1bd4 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:6a34de6e00791707056512e0f60575ce3391efdb1fc140188c27cc843b60437b +catalog_digest: sha256:cfc8151b42a8d705ee68024897afe4224e5a1cae9249dc09188c4b2e5b7c77bb # Dependencies # ----------------------------------------------------------------------------- @@ -39,7 +39,7 @@ elasticsearch_version: 1.1.2570 # Operator version 1.1.2470 # ----------------------------------------------------------------------------- mas_core_version: 9.1.x-feature: 9.1.0-pre.stable_8193 # No Update - 9.0.x: 9.0.10 # tbc + 9.0.x: 9.0.11 # tbc 8.10.x: 8.10.25 # tbc 8.11.x: 8.11.22 # tbc mas_assist_version: From e0a51090eb899c0104adb0193bfedde2f2941482 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 24 Apr 2025 18:24:19 +0530 Subject: [PATCH 28/39] [patch] update s390x: mas_core_version: 9.0.11 catalog_digest: sha256:3c4256570660cc42c4eea67c2144b8a151bf4b241d3682d699cb5986f8fd6517 --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 1447e432..792d8627 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:76c9c49e45cf9e52ae42f8eb214dabc1e9e8dd79037e8d6eeea2b200fce86dea +catalog_digest: sha256:3c4256570660cc42c4eea67c2144b8a151bf4b241d3682d699cb5986f8fd6517 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -16,7 +16,7 @@ tsm_version: 1.6.2 # No Update # Operator version 1.5.4 (https://g # ----------------------------------------------------------------------------- mas_core_version: 9.1.x-feature: 9.1.0-pre.stable_8193 # tbc - 9.0.x: 9.0.10 # tbc + 9.0.x: 9.0.11 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported mas_manage_version: From 332b936068d8b7ed785c13233f71b3e1754d3881 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Mon, 28 Apr 2025 18:14:05 +0530 Subject: [PATCH 29/39] [patch] update amd64: catalog_digest: sha256:25ae7b227916eaa6fac8a04afb1ca5cedbc49fbd1196b6c6490b537af8a28f33 --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 05cb1bd4..1b0ab02f 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:cfc8151b42a8d705ee68024897afe4224e5a1cae9249dc09188c4b2e5b7c77bb +catalog_digest: sha256:25ae7b227916eaa6fac8a04afb1ca5cedbc49fbd1196b6c6490b537af8a28f33 # Dependencies # ----------------------------------------------------------------------------- From 22406320b7f746d76866053c33f527a7c7135e1d Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Mon, 28 Apr 2025 18:14:07 +0530 Subject: [PATCH 30/39] [patch] update s390x: catalog_digest: sha256:24bddbf965ccfcb4fb231233d9c383890eb114ca73f5ce708dfd7c4725bed1ef --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 792d8627..ae7cc173 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:3c4256570660cc42c4eea67c2144b8a151bf4b241d3682d699cb5986f8fd6517 +catalog_digest: sha256:24bddbf965ccfcb4fb231233d9c383890eb114ca73f5ce708dfd7c4725bed1ef uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) From 8cbb931bd8510c36fcfb562a4569b8b5b0c57c5a Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 29 Apr 2025 12:52:22 +0530 Subject: [PATCH 31/39] [patch] update amd64: mas_manage_version: 9.1.0-pre.stable_10993 mas_optimizer_version: 9.1.0-pre.stable_1943,9.0.9,8.4.16,8.5.15 catalog_digest: sha256:55feb1250f29536a2c9f6b355456280af0e195bf743da2fd60b089f0872accfb --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 1b0ab02f..624ddad8 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:25ae7b227916eaa6fac8a04afb1ca5cedbc49fbd1196b6c6490b537af8a28f33 +catalog_digest: sha256:55feb1250f29536a2c9f6b355456280af0e195bf743da2fd60b089f0872accfb # Dependencies # ----------------------------------------------------------------------------- @@ -55,7 +55,7 @@ mas_iot_version: 8.10.x: 8.7.22 # tbc 8.11.x: 8.8.18 # tbc mas_manage_version: - 9.1.x-feature: 9.1.0-pre.stable_9992 # No Update + 9.1.x-feature: 9.1.0-pre.stable_10993 # No Update 9.0.x: 9.0.12 # tbc 8.10.x: 8.6.25 # tbc 8.11.x: 8.7.19 # tbc @@ -64,10 +64,10 @@ mas_monitor_version: 8.10.x: 8.10.19 # tbc 8.11.x: 8.11.17 # tbc mas_optimizer_version: - 9.1.x-feature: 9.1.0-pre.stable_1813 # No Update - 9.0.x: 9.0.10 # tbc - 8.10.x: 8.4.17 # tbc - 8.11.x: 8.5.16 # tbc + 9.1.x-feature: 9.1.0-pre.stable_1943 # No Update + 9.0.x: 9.0.9 # tbc + 8.10.x: 8.4.16 # tbc + 8.11.x: 8.5.15 # tbc mas_predict_version: 9.0.x: 9.0.7 # tbc 8.10.x: 8.8.8 # tbc From a9d6d241a8d2b8c6112ec34ec288248428cc3487 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 29 Apr 2025 12:52:24 +0530 Subject: [PATCH 32/39] [patch] update s390x: mas_manage_version: 9.1.0-pre.stable_10993 catalog_digest: sha256:ff3a9a5845e932fc8e695f47529ca37c12793b87a275a01abef9537bacbbf606 --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index ae7cc173..333ac73f 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:24bddbf965ccfcb4fb231233d9c383890eb114ca73f5ce708dfd7c4725bed1ef +catalog_digest: sha256:ff3a9a5845e932fc8e695f47529ca37c12793b87a275a01abef9537bacbbf606 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -20,7 +20,7 @@ mas_core_version: 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported mas_manage_version: - 9.1.x-feature: 9.1.0-pre.stable_9992 # tbc + 9.1.x-feature: 9.1.0-pre.stable_10993 # tbc 9.0.x: 9.0.12 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported From fc2eaff2e858fff535a9439480b40a616fdaf428 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 29 Apr 2025 18:06:09 +0530 Subject: [PATCH 33/39] [patch] update amd64: mas_core_version: 9.1.0-pre.stable_9709 catalog_digest: sha256:18f72f1ed0c1acdf8c871b64328a2ddf58142a0d54e2cc8b95efe980d0f2266b --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 624ddad8..f9ed7479 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:55feb1250f29536a2c9f6b355456280af0e195bf743da2fd60b089f0872accfb +catalog_digest: sha256:18f72f1ed0c1acdf8c871b64328a2ddf58142a0d54e2cc8b95efe980d0f2266b # Dependencies # ----------------------------------------------------------------------------- @@ -38,7 +38,7 @@ elasticsearch_version: 1.1.2570 # Operator version 1.1.2470 # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0-pre.stable_8193 # No Update + 9.1.x-feature: 9.1.0-pre.stable_9709 # No Update 9.0.x: 9.0.11 # tbc 8.10.x: 8.10.25 # tbc 8.11.x: 8.11.22 # tbc From e942ea993152bbf10c6460ef2f39fd45db2b21dc Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 29 Apr 2025 18:06:11 +0530 Subject: [PATCH 34/39] [patch] update s390x: mas_core_version: 9.1.0-pre.stable_9709 catalog_digest: sha256:21756e2a2e870df1d3e831e39d21d82dfbb662bd76dc6cabadd1b8c6efb4a126 --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 333ac73f..277c4c7f 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:ff3a9a5845e932fc8e695f47529ca37c12793b87a275a01abef9537bacbbf606 +catalog_digest: sha256:21756e2a2e870df1d3e831e39d21d82dfbb662bd76dc6cabadd1b8c6efb4a126 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -15,7 +15,7 @@ tsm_version: 1.6.2 # No Update # Operator version 1.5.4 (https://g # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0-pre.stable_8193 # tbc + 9.1.x-feature: 9.1.0-pre.stable_9709 # tbc 9.0.x: 9.0.11 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported From 2dee9c5beef22531282026a0b902763b88b557cd Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 30 Apr 2025 00:43:48 +0530 Subject: [PATCH 35/39] [patch] update amd64: mas_core_version: 9.1.0-pre.stable_9718 mas_optimizer_version: 9.0.10,8.4.17,8.5.16 catalog_digest: sha256:4d6d9c22b97dd6ccc6333d5fc616c7e1b1d9d6f524ba098fdacf497a8fbbed54 --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index f9ed7479..29871a29 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:18f72f1ed0c1acdf8c871b64328a2ddf58142a0d54e2cc8b95efe980d0f2266b +catalog_digest: sha256:4d6d9c22b97dd6ccc6333d5fc616c7e1b1d9d6f524ba098fdacf497a8fbbed54 # Dependencies # ----------------------------------------------------------------------------- @@ -38,7 +38,7 @@ elasticsearch_version: 1.1.2570 # Operator version 1.1.2470 # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0-pre.stable_9709 # No Update + 9.1.x-feature: 9.1.0-pre.stable_9718 # No Update 9.0.x: 9.0.11 # tbc 8.10.x: 8.10.25 # tbc 8.11.x: 8.11.22 # tbc @@ -65,9 +65,9 @@ mas_monitor_version: 8.11.x: 8.11.17 # tbc mas_optimizer_version: 9.1.x-feature: 9.1.0-pre.stable_1943 # No Update - 9.0.x: 9.0.9 # tbc - 8.10.x: 8.4.16 # tbc - 8.11.x: 8.5.15 # tbc + 9.0.x: 9.0.10 # tbc + 8.10.x: 8.4.17 # tbc + 8.11.x: 8.5.16 # tbc mas_predict_version: 9.0.x: 9.0.7 # tbc 8.10.x: 8.8.8 # tbc From 2f6decc8833f1aa191aa87ee0b4a20d97c5233dc Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Wed, 30 Apr 2025 00:43:50 +0530 Subject: [PATCH 36/39] [patch] update s390x: mas_core_version: 9.1.0-pre.stable_9718 catalog_digest: sha256:ef9b2763060e8e142f42530eb94e37f15d50e2ffe18dd62de93a1fceb4957c83 --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 277c4c7f..75b20bd2 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:21756e2a2e870df1d3e831e39d21d82dfbb662bd76dc6cabadd1b8c6efb4a126 +catalog_digest: sha256:ef9b2763060e8e142f42530eb94e37f15d50e2ffe18dd62de93a1fceb4957c83 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -15,7 +15,7 @@ tsm_version: 1.6.2 # No Update # Operator version 1.5.4 (https://g # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0-pre.stable_9709 # tbc + 9.1.x-feature: 9.1.0-pre.stable_9718 # tbc 9.0.x: 9.0.11 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported From a8bb0bcd617689e4f18153083b56bd0c4446517c Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 1 May 2025 11:22:15 +0530 Subject: [PATCH 37/39] [patch] update amd64: mas_manage_version: 9.0.13,8.6.26,8.7.20 catalog_digest: sha256:5121d783b8f59d35d32d6bf6cdbfe63f79b81f7f330016d07d5b58609171ccab --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index 29871a29..d9a166cd 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:4d6d9c22b97dd6ccc6333d5fc616c7e1b1d9d6f524ba098fdacf497a8fbbed54 +catalog_digest: sha256:5121d783b8f59d35d32d6bf6cdbfe63f79b81f7f330016d07d5b58609171ccab # Dependencies # ----------------------------------------------------------------------------- @@ -56,9 +56,9 @@ mas_iot_version: 8.11.x: 8.8.18 # tbc mas_manage_version: 9.1.x-feature: 9.1.0-pre.stable_10993 # No Update - 9.0.x: 9.0.12 # tbc - 8.10.x: 8.6.25 # tbc - 8.11.x: 8.7.19 # tbc + 9.0.x: 9.0.13 # tbc + 8.10.x: 8.6.26 # tbc + 8.11.x: 8.7.20 # tbc mas_monitor_version: 9.0.x: 9.0.9 # tbc 8.10.x: 8.10.19 # tbc From 774ee23272ba0a57a922ad93df14fefe5dcf1799 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Thu, 1 May 2025 11:22:17 +0530 Subject: [PATCH 38/39] [patch] update s390x: mas_manage_version: 9.0.13 catalog_digest: sha256:101f126494d4840f7cda7aa87b30d49aafd9abf736d455bf65597f0b35b1c070 --- src/mas/devops/data/catalogs/v9-250501-s390x.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml index 75b20bd2..7594c932 100644 --- a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml @@ -5,7 +5,7 @@ # catalog itself, but not everything in the catalog supports this yet (including MAS) # so we need to use the CASE bundle mirror process still. -catalog_digest: sha256:ef9b2763060e8e142f42530eb94e37f15d50e2ffe18dd62de93a1fceb4957c83 +catalog_digest: sha256:101f126494d4840f7cda7aa87b30d49aafd9abf736d455bf65597f0b35b1c070 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.11.1 # tbc # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) @@ -21,7 +21,7 @@ mas_core_version: 8.11.x: "" # Not Supported mas_manage_version: 9.1.x-feature: 9.1.0-pre.stable_10993 # tbc - 9.0.x: 9.0.12 # tbc + 9.0.x: 9.0.13 # tbc 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported From 5ff35ceea94990460febbea3278b86ec2468e2e7 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Fri, 2 May 2025 17:17:44 +0530 Subject: [PATCH 39/39] [patch] empty commit --- src/mas/devops/data/catalogs/v9-250501-amd64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml index d9a166cd..cc3bd7c7 100644 --- a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml @@ -108,3 +108,4 @@ amlen_extras_version: 1.1.2 # Default Cloud Pak for Data version # ------------------------------------------------------------------------------ cpd_product_version_default: 5.0.0 +