diff --git a/src/mas/devops/data/catalogs/v9-250828-amd64.yaml b/src/mas/devops/data/catalogs/v9-250828-amd64.yaml index 40c2ede5..5be4ffc4 100644 --- a/src/mas/devops/data/catalogs/v9-250828-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250828-amd64.yaml @@ -42,7 +42,7 @@ 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.2667 # Operator version 1.1.2667 - +minio_version: RELEASE.2025-06-13T11-33-47Z # Maximo Application Suite # ----------------------------------------------------------------------------- diff --git a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml index 2f92a5df..b7d504d4 100644 --- a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml @@ -141,4 +141,5 @@ cpd_product_version_default: 5.1.3 # Extra Images for kmodels # ------------------------------------------------------------------------------ kmodels_extras_version_default: 1.0.14 +minio_version: RELEASE.2025-06-13T11-33-47Z diff --git a/src/mas/devops/data/catalogs/v9-250925-amd64.yaml b/src/mas/devops/data/catalogs/v9-250925-amd64.yaml index 901747e3..dbc421ab 100644 --- a/src/mas/devops/data/catalogs/v9-250925-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250925-amd64.yaml @@ -144,5 +144,6 @@ cpd_product_version_default: 5.1.3 # Extra Images for kmodels # ------------------------------------------------------------------------------ kmodels_extras_version_default: 1.0.14 +minio_version: RELEASE.2025-06-13T11-33-47Z manage_extras_913: 9.1.3 diff --git a/src/mas/devops/data/catalogs/v9-251010-amd64.yaml b/src/mas/devops/data/catalogs/v9-251010-amd64.yaml index cdd0598f..2d0b6e5d 100644 --- a/src/mas/devops/data/catalogs/v9-251010-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-251010-amd64.yaml @@ -140,5 +140,6 @@ cpd_product_version_default: 5.1.3 # Extra Images for kmodels # ------------------------------------------------------------------------------ kmodels_extras_version_default: 1.0.14 +minio_version: RELEASE.2025-06-13T11-33-47Z manage_extras_913: 9.1.3 diff --git a/src/mas/devops/data/catalogs/v9-251030-amd64.yaml b/src/mas/devops/data/catalogs/v9-251030-amd64.yaml index ea177e6a..6383c7ac 100644 --- a/src/mas/devops/data/catalogs/v9-251030-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-251030-amd64.yaml @@ -138,8 +138,5 @@ amlen_extras_version: 1.1.3 # ------------------------------------------------------------------------------ cpd_product_version_default: 5.1.3 -# Extra Images for kmodels -# ------------------------------------------------------------------------------ -kmodels_extras_version_default: 1.0.14 - manage_extras_913: 9.1.3 +minio_version: RELEASE.2025-06-13T11-33-47Z diff --git a/src/mas/devops/data/catalogs/v9-251127-amd64.yaml b/src/mas/devops/data/catalogs/v9-251127-amd64.yaml index b09f7ef1..df125993 100644 --- a/src/mas/devops/data/catalogs/v9-251127-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-251127-amd64.yaml @@ -137,7 +137,5 @@ amlen_extras_version: 1.1.3 # ------------------------------------------------------------------------------ cpd_product_version_default: 5.1.3 -# Extra Images for kmodels -# ------------------------------------------------------------------------------ -kmodels_extras_version_default: 1.0.14 - +manage_extras_913: 9.1.3 +minio_version: RELEASE.2025-06-13T11-33-47Z diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index 4f091e58..61b4bc23 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -37,7 +37,8 @@ def isAirgapInstall(dynClient: DynamicClient, checkICSP: bool = False) -> bool: else: IDMSApi = dynClient.resources.get(api_version="config.openshift.io/v1", kind="ImageDigestMirrorSet") masIDMS = IDMSApi.get(label_selector="mas.ibm.com/idmsContent=ibm") - return len(masIDMS.items) > 0 + aiserviceIDMS = IDMSApi.get(label_selector="aiservice.ibm.com/idmsContent=ibm") + return len(masIDMS.items) + len(aiserviceIDMS.items) > 0 def getDefaultStorageClasses(dynClient: DynamicClient) -> dict: