Add ocp compatibility info to catalogs

durera · durera · commit dcd9543352c3 · 2025-07-23T00:51:28.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)
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/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
