From d15694b53bd5c9f4d1ecd55d502de07c3d844e9a Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Fri, 22 Aug 2025 10:23:25 +0530 Subject: [PATCH 1/5] stuff --- src/mas/devops/data/catalogs/v9-250624-amd64.yaml | 2 ++ src/mas/devops/mas.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml index 1c12692f..c4eb09af 100644 --- a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml @@ -42,6 +42,8 @@ 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 +minio_version: RELEASE.2025-06-13T11-33-47Z +mariadb_version: 1-188 # Maximo Application Suite diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index 46419753..53f39b31 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: From 33664332d5d89af66625d576e3608728774af03d Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Thu, 28 Aug 2025 21:43:36 +0100 Subject: [PATCH 2/5] catalog --- src/mas/devops/data/catalogs/v9-250624-amd64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml index c4eb09af..8d76e8c7 100644 --- a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml @@ -139,4 +139,4 @@ cpd_product_version_default: 5.1.3 # Extra Images for kmodels # ------------------------------------------------------------------------------ -kmodels_extras_version_default: 1.0.11 +kmodels_extras_version: 1.0.13 From f8ec51a83230ce6f47506af9424b85c9b5b6df61 Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Fri, 29 Aug 2025 15:30:50 +0100 Subject: [PATCH 3/5] move to august catalog --- Makefile | 8 ++++---- src/mas/devops/data/catalogs/v9-250624-amd64.yaml | 4 +--- src/mas/devops/data/catalogs/v9-250828-amd64.yaml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6e7d605e..6d24b7dc 100644 --- a/Makefile +++ b/Makefile @@ -7,16 +7,16 @@ clean: rm -rf venv install: venv - . venv/bin/activate && python -m pip install --editable .[dev] + . venv/Scripts/activate && python -m pip install --editable .[dev] build: venv rm -f README.rst - . venv/bin/activate && python -m build + . venv/Scripts/activate && python -m build lint: venv rm -f README.rst - . venv/bin/activate && flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics && flake8 src --count --exit-zero --max-complexity=10 --max-line-length=200 --statistics + . venv/Scripts/activate && flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics && flake8 src --count --exit-zero --max-complexity=10 --max-line-length=200 --statistics pyinstaller: venv rm -f README.rst - . venv/bin/activate && pyinstaller src/mas-upgrade --onefile --noconfirm --add-data="src/mas/devops/templates/ibm-mas-tekton.yaml:mas/devops/templates" --add-data="src/mas/devops/templates/subscription.yml.j2:mas/devops/templates/" --add-data="src/mas/devops/templates/pipelinerun-upgrade.yml.j2:mas/devops/templates/" + . venv/Scripts/activate && pyinstaller src/mas-upgrade --onefile --noconfirm --add-data="src/mas/devops/templates/ibm-mas-tekton.yaml:mas/devops/templates" --add-data="src/mas/devops/templates/subscription.yml.j2:mas/devops/templates/" --add-data="src/mas/devops/templates/pipelinerun-upgrade.yml.j2:mas/devops/templates/" diff --git a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml index 1b8c289e..3bb4cff6 100644 --- a/src/mas/devops/data/catalogs/v9-250624-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250624-amd64.yaml @@ -42,8 +42,6 @@ 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 -minio_version: RELEASE.2025-06-13T11-33-47Z -mariadb_version: 1-188 # Maximo Application Suite @@ -141,4 +139,4 @@ cpd_product_version_default: 5.1.3 # Extra Images for kmodels # ------------------------------------------------------------------------------ -kmodels_extras_version: 1.0.13 +kmodels_extras_version_default: 1.0.11 diff --git a/src/mas/devops/data/catalogs/v9-250828-amd64.yaml b/src/mas/devops/data/catalogs/v9-250828-amd64.yaml index 9f32a585..51a1c887 100644 --- a/src/mas/devops/data/catalogs/v9-250828-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250828-amd64.yaml @@ -41,7 +41,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 # ----------------------------------------------------------------------------- From 06d901976275bf1dd42543c2629dc2814e6e357f Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Fri, 29 Aug 2025 15:34:00 +0100 Subject: [PATCH 4/5] revert Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6d24b7dc..6e7d605e 100644 --- a/Makefile +++ b/Makefile @@ -7,16 +7,16 @@ clean: rm -rf venv install: venv - . venv/Scripts/activate && python -m pip install --editable .[dev] + . venv/bin/activate && python -m pip install --editable .[dev] build: venv rm -f README.rst - . venv/Scripts/activate && python -m build + . venv/bin/activate && python -m build lint: venv rm -f README.rst - . venv/Scripts/activate && flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics && flake8 src --count --exit-zero --max-complexity=10 --max-line-length=200 --statistics + . venv/bin/activate && flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics && flake8 src --count --exit-zero --max-complexity=10 --max-line-length=200 --statistics pyinstaller: venv rm -f README.rst - . venv/Scripts/activate && pyinstaller src/mas-upgrade --onefile --noconfirm --add-data="src/mas/devops/templates/ibm-mas-tekton.yaml:mas/devops/templates" --add-data="src/mas/devops/templates/subscription.yml.j2:mas/devops/templates/" --add-data="src/mas/devops/templates/pipelinerun-upgrade.yml.j2:mas/devops/templates/" + . venv/bin/activate && pyinstaller src/mas-upgrade --onefile --noconfirm --add-data="src/mas/devops/templates/ibm-mas-tekton.yaml:mas/devops/templates" --add-data="src/mas/devops/templates/subscription.yml.j2:mas/devops/templates/" --add-data="src/mas/devops/templates/pipelinerun-upgrade.yml.j2:mas/devops/templates/" From d2b3fd41e6615a5bb1cd6ffadaf9515b2ebbf987 Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Fri, 5 Sep 2025 09:50:25 +0100 Subject: [PATCH 5/5] september catalog --- src/mas/devops/data/catalogs/v9-250902-amd64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml index 53b0e23d..a9bbbbd5 100644 --- a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml @@ -140,4 +140,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