[major] AI Broker / AI Service cleanup (#90)

durera · web-flow · commit 723fd255ca98 · 2025-07-31T18:16:53.000+01:00
diff --git a/src/mas/devops/data/catalogs/v9-250109-amd64.yaml b/src/mas/devops/data/catalogs/v9-250109-amd64.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:028f32213d3f14405eda7e78aaec28411688272f3358c5a34f6ebed6cf46c4c3
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 # Dependencies
 # -----------------------------------------------------------------------------
 ibm_licensing_version: 4.2.10                 # Operator version 4.2.7 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
diff --git a/src/mas/devops/data/catalogs/v9-250109-s390x.yaml b/src/mas/devops/data/catalogs/v9-250109-s390x.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:82a017b04ac8f15b14719e77435e1000046e8d90c24fa7fce45421f4e289d0fd
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 uds_version: 2.0.12                          # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.10.3 # Updated                    # 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)
diff --git a/src/mas/devops/data/catalogs/v9-250206-amd64.yaml b/src/mas/devops/data/catalogs/v9-250206-amd64.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:12ece30673a4109123e43f28a8f2d427bd37186c32d961c0dced8866886a2d4c
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 # Dependencies
 # -----------------------------------------------------------------------------
 ibm_licensing_version: 4.2.11                 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
diff --git a/src/mas/devops/data/catalogs/v9-250206-s390x.yaml b/src/mas/devops/data/catalogs/v9-250206-s390x.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:b9ef2ef8d16bd9bb1015d8f2597c5f4f7daadbbefab700268c914f1b07582d25
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 uds_version: 2.0.12                          # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.11.0 # Updated                    # 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)
diff --git a/src/mas/devops/data/catalogs/v9-250306-amd64.yaml b/src/mas/devops/data/catalogs/v9-250306-amd64.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:d2ffdec7d99dd4b0027d151b36b08b97efd58a1203bd0874fe782ad497198419
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 # Dependencies
 # -----------------------------------------------------------------------------
 ibm_licensing_version: 4.2.11                 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
diff --git a/src/mas/devops/data/catalogs/v9-250306-s390x.yaml b/src/mas/devops/data/catalogs/v9-250306-s390x.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:a9f4a2a8aa4ec25b68ff6a1592c0773f730564a833b14eef5585a077e37c203a
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 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 # Updated                    # 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)
diff --git a/src/mas/devops/data/catalogs/v9-250403-amd64.yaml b/src/mas/devops/data/catalogs/v9-250403-amd64.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:e225b03ff1054e2b1bcef0fcc883cc8f53c7b29f472ca7d3c08cb6a6084b2ab4
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 # Dependencies
 # -----------------------------------------------------------------------------
 ibm_licensing_version: 4.2.12                 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
@@ -77,7 +82,7 @@ mas_visualinspection_version:
   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
diff --git a/src/mas/devops/data/catalogs/v9-250403-s390x.yaml b/src/mas/devops/data/catalogs/v9-250403-s390x.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:45f4a5de29d15b936399adc28a80258557420094f1f7740c97e8d44a84446a85
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 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)
diff --git a/src/mas/devops/data/catalogs/v9-250501-amd64.yaml b/src/mas/devops/data/catalogs/v9-250501-amd64.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:152bb3a71e029d2215a14816ac928bc28054d85d6123a3813c9679fd7eb91650
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 # Dependencies
 # -----------------------------------------------------------------------------
 ibm_licensing_version: 4.2.12                 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
diff --git a/src/mas/devops/data/catalogs/v9-250501-s390x.yaml b/src/mas/devops/data/catalogs/v9-250501-s390x.yaml
@@ -7,6 +7,11 @@
 
 catalog_digest: sha256:9d0437b2e7391fb4e28ba42294c442fea5d157bd1699d7d7a415dd7a5a27a6f9
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+
 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  # No Update              # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:cf03a9bcfacaf9c354078dfb2f97c166bfb1a6f0776680b52b7325cc469ffb31
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 # Dependencies
 # -----------------------------------------------------------------------------
 ibm_licensing_version: 4.2.14                # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
@@ -93,9 +100,10 @@ mas_facilities_version:
   9.0.x: ""       # Not Supported
   8.10.x: ""      # Not Supported
   8.11.x: ""      # Not Supported
-mas_aibroker_version:
-  9.1.x: 9.1.0
-  9.0.x: 9.0.6
+
+aiservice_version:
+  9.1.x: ""  # Not Ready Yet
+
 # Extra Images for UDS
 # ------------------------------------------------------------------------------
 uds_extras_version: 1.5.0
diff --git a/src/mas/devops/data/catalogs/v9-250624-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250624-ppc64le.yaml
@@ -7,11 +7,17 @@
 
 catalog_digest: sha256:70b87e1fe64eb46c3796ce0aaa713b0ff3c902732078fc5297c28f7840f23d3e
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.0  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.6.2   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
 
-
 # Maximo Application Suite
 # -----------------------------------------------------------------------------
 mas_core_version:
diff --git a/src/mas/devops/data/catalogs/v9-250624-s390x.yaml b/src/mas/devops/data/catalogs/v9-250624-s390x.yaml
@@ -7,11 +7,17 @@
 
 catalog_digest: sha256:5748e21db7f688c8d80c5ab14e394e5575997cfc2e544d77b2173159dc237aba
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.0  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.0   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
 
-
 # Maximo Application Suite
 # -----------------------------------------------------------------------------
 mas_core_version:
diff --git a/src/mas/devops/data/catalogs/v9-250828-amd64.yaml b/src/mas/devops/data/catalogs/v9-250828-amd64.yaml
@@ -0,0 +1,139 @@
+---
+# Case bundle configuration for IBM Maximo Operator Catalog 250624 (AMD64)
+# -----------------------------------------------------------------------------
+# 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:cf03a9bcfacaf9c354078dfb2f97c166bfb1a6f0776680b52b7325cc469ffb31
+
+ocp_compatibility:
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
+# Dependencies
+# -----------------------------------------------------------------------------
+ibm_licensing_version: 4.2.14                # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
+common_svcs_version: 4.12.0                  # Operator version 4.12.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
+common_svcs_version_1: 4.11.0                  # Additional version 4.11.0
+
+cp4d_platform_version: 5.1.1                 # Operator version 5.1.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
+ibm_zen_version: 6.1.1+20250218.180746.89    # 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.12.0                          # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
+tsm_version: 1.7.0                           # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
+dd_version: 1.1.19                           # 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.2.0                          # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
+wsl_runtimes_version: 10.3.0                 # cpd 5.1.3 uses version 10.3.0 of wsl runtimes but only 10.2.0 for wsl itself
+wml_version: 10.2.0                          # Operator version 5.0.0
+
+# Why are these commented out?
+# ccs_build: +20240528.144404.460            # ibm-ccs from version 9.0.0 requires the build version
+# datarefinery_build: +20240517.202103.146
+
+spark_version: 10.2.0                         # Operator version 7.3.0
+cognos_version: 27.2.0                       # Operator version 25.0.0
+couchdb_version: 1.0.13                      # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml)
+elasticsearch_version: 1.1.2570              # Operator version 1.1.2470
+
+
+# Maximo Application Suite
+# -----------------------------------------------------------------------------
+mas_core_version:
+  9.1.x-feature: 9.1.0 # Updated
+  9.1.x: 9.1.0         # Updated
+  9.0.x: 9.0.12        # Updated
+  8.10.x: 8.10.26      # Updated
+  8.11.x: 8.11.23      # Updated
+mas_assist_version:
+  9.1.x: 9.1.0    # Updated
+  9.0.x: 9.0.6    # Updated
+  8.10.x: 8.7.8   # No Update
+  8.11.x: 8.8.7   # No Update
+mas_hputilities_version:
+  9.1.x: ""       # Not Supported
+  9.0.x: ""       # Not Supported
+  8.10.x: 8.6.7   # No Update
+  8.11.x: ""      # Not Supported
+mas_iot_version:
+  9.1.x: 9.1.0    # Updated
+  9.0.x: 9.0.9    # Updated
+  8.10.x: 8.7.23  # Updated
+  8.11.x: 8.8.19  # Updated
+mas_manage_version:
+  9.1.x-feature: 9.1.0 # Updated
+  9.1.x: 9.1.0         # Updated
+  9.0.x: 9.0.14        # Updated
+  8.10.x: 8.6.27       # Updated
+  8.11.x: 8.7.21       # Updated
+mas_monitor_version:
+  9.1.x: 9.1.0 # Updated
+  9.0.x: 9.0.10   # updated
+  8.10.x: 8.10.20 # updated
+  8.11.x: 8.11.18 # updated
+mas_optimizer_version:
+  9.1.x-feature: 9.1.0 # Updated
+  9.1.x: 9.1.0         # Updated
+  9.0.x: 9.0.12        # Updated
+  8.10.x: 8.4.19       # Updated
+  8.11.x: 8.5.18       # Updated
+mas_predict_version:
+  9.1.x: 9.1.0    # Updated
+  9.0.x: 9.0.7    # No Update
+  8.10.x: 8.8.8   # No Update
+  8.11.x: 8.9.10  # No Update
+mas_visualinspection_version:
+  9.1.x-feature: 9.1.0 # Updated
+  9.1.x: 9.1.0         # Updated
+  9.0.x: 9.0.9         # No Update
+  8.10.x: 8.8.4        # No Update
+  8.11.x: 8.9.12       # No Update
+mas_facilities_version:
+  9.1.x: 9.1.0    # Updated
+  9.0.x: ""       # Not Supported
+  8.10.x: ""      # Not Supported
+  8.11.x: ""      # Not Supported
+
+aiservice_version:
+  9.1.x: 9.1.3
+
+# 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.3
+
+# Default Cloud Pak for Data version
+# ------------------------------------------------------------------------------
+cpd_product_version_default: 5.1.3
+
+# Extra Images for kmodels
+# ------------------------------------------------------------------------------
+kmodels_extras_version_default: 1.0.13
diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py
@@ -61,6 +61,23 @@ def connect(server: str, token: str, skipVerify: bool = False) -> bool:
     return True
 
 
+def getClusterVersion(dynClient: DynamicClient) -> str:
+    """
+    Get a namespace
+    """
+    clusterVersionAPI = dynClient.resources.get(api_version="config.openshift.io/v1", kind="ClusterVersion")
+
+    # Version jsonPath = .status.history[?(@.state=="Completed")].version
+    try:
+        clusterVersion = clusterVersionAPI.get(name="version")
+        for record in clusterVersion.status.history:
+            if record.state == "Completed":
+                return record.state.version
+    except NotFoundError:
+        logger.debug("Unable to retrieve ClusterVersion")
+    return None
+
+
 def getNamespace(dynClient: DynamicClient, namespace: str) -> dict:
     """
     Get a namespace
diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py
diff --git a/src/mas/devops/templates/aiservice-pipelines-pvc.yml.j2 b/src/mas/devops/templates/aiservice-pipelines-pvc.yml.j2
diff --git a/src/mas/devops/templates/aiservice-pipelines-rbac.yml.j2 b/src/mas/devops/templates/aiservice-pipelines-rbac.yml.j2
diff --git a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2
diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2
diff --git a/test/src/test_data.py b/test/src/test_data.py
