mas-devops 9.5.0__py3-none-any.whl → 9.6.1__py3-none-any.whl

mas/devops/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "9.5.0"
+__version__ = "9.6.1"

mas/devops/data/__init__.py

@@ -1,5 +1,5 @@
 # *****************************************************************************
-# Copyright (c) 2024 IBM Corporation and other Contributors.
+# Copyright (c) 2024, 2026 IBM Corporation and other Contributors.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -20,7 +20,11 @@ from glob import glob
 from os import path
 
 
-def getCatalog(name: str) -> dict | None:
+class NoSuchCatalogError(Exception):
+    pass
+
+
+def getCatalog(name: str) -> dict:
     """
     Load a specific IBM Operator Catalog definition by name.
 
@@ -32,7 +36,9 @@ def getCatalog(name: str) -> dict | None:
 
     Returns:
         dict: The catalog definition dictionary containing operator versions and metadata.
-              Returns None if the catalog file doesn't exist.
+
+    Raises:
+        NoSuchCatalogError: If the specified catalog does not exist.
     """
     moduleFile = path.abspath(__file__)
     modulePath = path.dirname(moduleFile)
@@ -40,13 +46,15 @@ def getCatalog(name: str) -> dict | None:
 
     pathToCatalog = path.join(modulePath, "catalogs", catalogFileName)
     if not path.exists(pathToCatalog):
-        return None
+        raise NoSuchCatalogError(
+            f"Catalog {name} is unknown: {pathToCatalog} does not exist"
+        )
 
     with open(pathToCatalog) as stream:
         return yaml.safe_load(stream)
 
 
-def listCatalogTags(arch="amd64") -> list:
+def listCatalogTags(arch="amd64") -> list[str]:
     """
     List all available IBM Operator Catalog tags for a specific architecture.
 
@@ -70,7 +78,7 @@ def listCatalogTags(arch="amd64") -> list:
     return result
 
 
-def getNewestCatalogTag(arch="amd64") -> str | None:
+def getNewestCatalogTag(arch="amd64") -> str:
     """
     Get the most recent IBM Operator Catalog tag for a specific architecture.
 
@@ -83,11 +91,13 @@ def getNewestCatalogTag(arch="amd64") -> str | None:
 
     Returns:
         str: The newest catalog tag (e.g., "v9-241205-amd64").
-             Returns None if no catalogs are found for the architecture.
+
+    Raises:
+        NoSuchCatalogError: If no catalogs are found for the specified architecture.
     """
     catalogs = listCatalogTags(arch)
     if len(catalogs) == 0:
-        return None
+        raise NoSuchCatalogError(f"There are no known catalogs for the {arch} platform")
     else:
         return catalogs[-1]
 
@@ -174,7 +184,5 @@ def getCatalogEditorial(catalogTag: str) -> dict | None:
               or has no editorial content.
     """
     catalog = getCatalog(catalogTag)
-    if not catalog:
-        return None
 
     return catalog.get("editorial")

mas/devops/templates/pipelinerun-install.yml.j2

@@ -535,6 +535,14 @@ spec:
     - name: mas_routing_mode
       value: "{{ mas_routing_mode }}"
 {%- endif %}
+{%- if mas_ingress_controller_name is defined and mas_ingress_controller_name != "" %}
+    - name: mas_ingress_controller_name
+      value: "{{ mas_ingress_controller_name }}"
+{%- endif %}
+{%- if mas_configure_ingress is defined and mas_configure_ingress != "" %}
+    - name: mas_configure_ingress
+      value: "{{ mas_configure_ingress }}"
+{%- endif %}
 
     # MAS Workspace
     # -------------------------------------------------------------------------
@@ -839,6 +847,13 @@ spec:
     - name: aiservice_odh_model_deployment_type
       value: "{{ aiservice_odh_model_deployment_type }}"
 
+    # AI Service - Red Hat Openshift AI
+    # -------------------------------------------------------------------------
+    - name: aiservice_rhoai_model_deployment_type
+      value: "{{ aiservice_rhoai_model_deployment_type }}"
+    - name: rhoai
+      value: "{{ rhoai }}"
+
     # AI Service - watsonX
     # -------------------------------------------------------------------------
     - name: aiservice_watsonxai_apikey
@@ -863,6 +878,14 @@ spec:
       value: "{{ aiservice_watsonxai_space_id }}"
     - name: aiservice_watsonxai_on_prem
       value: "{{ aiservice_watsonxai_on_prem }}"
+
+    # AI Service - watsonX
+    # -------------------------------------------------------------------------
+{%- if aiservice_certificate_issuer is defined and aiservice_certificate_issuer != "" %}
+    - name: aiservice_certificate_issuer
+      value: "{{ aiservice_certificate_issuer }}"
+{%- endif %}
+
 {%- endif %}
 
   workspaces:

{mas_devops-9.5.0.dist-info → mas_devops-9.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-devops
-Version: 9.5.0
+Version: 9.6.1
 Summary: Python for Maximo Application Suite Dev/Ops
 Home-page: https://github.com/ibm-mas/python-devops
 Author: David Parker

{mas_devops-9.5.0.dist-info → mas_devops-9.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mas/devops/__init__.py,sha256=gtCpZLbQvVbt2Kyub5QSZEF-tEs4fZvBlYW9rtVzHAg,490
+mas/devops/__init__.py,sha256=sBvS_IYg3GWnAD4Fqa8WeUgRpcc4mDGj5eKugIfyWqk,490
 mas/devops/aiservice.py,sha256=mEDHJwGJLGq7z23k86yStIQLplV-PCo7_U7mJl3rv78,5851
 mas/devops/db2.py,sha256=o3XXwAtudrmSKSRjrAB-fNQUBIRV02EE5YMo7bhHN0g,17775
 mas/devops/ocp.py,sha256=LzxzOom1L5HkE3PuOwLiY90CmisYDs0_tnrUTdPHNe4,22374
@@ -8,7 +8,7 @@ mas/devops/sls.py,sha256=ocuzKYb5WH5Gabv0vKuJsLfwvnCWZySx6Re6T0u9bEI,3300
 mas/devops/tekton.py,sha256=aHUA503S9K7bmRLPMBt5xMqUHWYbIQ0Ps0gwZt2Z2_0,31967
 mas/devops/users.py,sha256=SSmZ4DjfjB1a38VypozUSOXq-FCCoBj0s04u6vQAFXc,51740
 mas/devops/utils.py,sha256=S8OayiQrW4Jck1yo4T0YMktgxHMum087dIhmxff1Ry8,3176
-mas/devops/data/__init__.py,sha256=aiwVbNG-XshyCD6h5vlwsWhXsSn6ZP9xle7kGZ7oez0,6057
+mas/devops/data/__init__.py,sha256=lDKA9-TnOyx_j-Bxg6ioo2PP3f3haCUGEQkNZ7nldI4,6273
 mas/devops/data/ocp.yaml,sha256=RXf16j8BIdifZQTpb_SLeGMKrwykMvuucLIoNcN8uJw,1653
 mas/devops/data/catalogs/v8-230414-amd64.yaml,sha256=1kgow2tP8VU3Hlc_uIt5qbBWxZJkoYDkWwCF2tYxmr8,2695
 mas/devops/data/catalogs/v8-230518-amd64.yaml,sha256=W43kSKYpfEUO7Ijxz69H3EZ1_riCPvZ4hcjXn5S9Np0,2689
@@ -76,8 +76,8 @@ mas/devops/data/catalogs/v9-251231-amd64.yaml,sha256=xbLO_bLonBKrH0VElSJlgdG6J4n
 mas/devops/data/catalogs/v9-251231-ppc64le.yaml,sha256=qmDs3HVITgk6Vl8r8JiEov-bG39cCzTsFrfboJDHtDQ,2707
 mas/devops/data/catalogs/v9-251231-s390x.yaml,sha256=qyQhKP9jnyub5YwxFeeOOFpGJWlODPeFo3mz0pWAOoE,2706
 mas/devops/data/catalogs/v9-260129-amd64.yaml,sha256=nE6mLpgZHTA8KnpfgoDMN5FzCtLWeiQLG9aFoX8kipM,7943
+mas/devops/data/catalogs/v9-260129-ppc64le.yaml,sha256=OvbEBeukR7cZYxL4sueSEqdVnAETewCjGJrdHoydNas,2750
 mas/devops/data/catalogs/v9-260129-s390x.yaml,sha256=hJDRSU29v16SgOx9joF3pdcuzBZw1VGiqlMgDNiwvXs,2748
-mas/devops/data/catalogs/v9-290129-ppc64le.yaml,sha256=OvbEBeukR7cZYxL4sueSEqdVnAETewCjGJrdHoydNas,2750
 mas/devops/mas/__init__.py,sha256=3wmrhN2JRZDXcVWVYnj00tIPxezuDGFQq7kO-hOLTE0,336
 mas/devops/mas/apps.py,sha256=Bi8ICuERNWhltosv5XhSQwZmxMIvyNq2fKqC78EbAH8,9092
 mas/devops/mas/suite.py,sha256=qcf-syoJTmQpheXpbhSn3YHTXk_0l9uFpZ4ADspFklo,13203
@@ -90,7 +90,7 @@ mas/devops/templates/ibm-entitlement-secret.yml.j2,sha256=-pbGOQ9_XHklqtbMflDoOw
 mas/devops/templates/operatorgroup.yml.j2,sha256=wxNQdb4ts_ZUwb9NLit0Q9hz-3kC9rv5oenA5UWlcwg,247
 mas/devops/templates/pipeline-additional-configs.yml.j2,sha256=UDutfXjVePx6u2MVjzlFw3WqGSPYHfpXDxgZalcVprQ,91
 mas/devops/templates/pipelinerun-aiservice-upgrade.yml.j2,sha256=PV4-6A5TMMmmZhJIsdLtmgqu4oU8n573uGdHL-ZhawQ,1797
-mas/devops/templates/pipelinerun-install.yml.j2,sha256=XzY7koXV0AXut-c4HNb1xnzrek2EG0lVby2vTzsTA7A,35693
+mas/devops/templates/pipelinerun-install.yml.j2,sha256=QybyzQhcSiXyFijs4XC0zsd5lXguAm7VHgY8UOQOdZM,36624
 mas/devops/templates/pipelinerun-uninstall.yml.j2,sha256=7ZyVARoT5ThN1ktsrnp0LiL-n4d92U45_8QYphHB99I,827
 mas/devops/templates/pipelinerun-update.yml.j2,sha256=dLE7SZJo1Wdr05K0c28rwNLIjWkTtrMedtVUbKuE2CM,4707
 mas/devops/templates/pipelinerun-upgrade.yml.j2,sha256=xBGlxxGeV5h1Opozb--GgothxVXD-XCp7WZ3vkzsfHY,10937
@@ -98,12 +98,12 @@ mas/devops/templates/pipelines-pvc.yml.j2,sha256=Mr3vbc-nLaGtscqCD9lxtGybE6axfGv
 mas/devops/templates/pipelines-rbac-cluster.yml.j2,sha256=0zc5HLjgDXfBEKNDjKym-sIQlMCvcIizbY-8m7xoNpA,320
 mas/devops/templates/pipelines-rbac.yml.j2,sha256=6hU4MvgEOrRlSMAgKbfHg6LHTReZ7702wKfYWg11G4Y,364
 mas/devops/templates/subscription.yml.j2,sha256=VBrktpatF9_CWuYuQCbOKEysCOt-29Lfvuho80Tn_4s,400
-mas_devops-9.5.0.data/scripts/mas-devops-create-initial-users-for-saas,sha256=2yqUg3mzHYQeeIjTGPFo7o8x6RBs0MIb3WVwvNlwB9A,5846
-mas_devops-9.5.0.data/scripts/mas-devops-db2-validate-config,sha256=ZKM3YlVspcCi9zIgdZZPG1MC782TlpE_U5kDGqGX_us,1800
-mas_devops-9.5.0.data/scripts/mas-devops-notify-slack,sha256=RkstUWFD-hxru9DS652t-nmn4EBtNPMqdGMVTFVMSBI,4849
-mas_devops-9.5.0.data/scripts/mas-devops-saas-job-cleaner,sha256=LzKGJiBffMdxL0XyiUC94XV0omZ65xFPs_regbl6tNw,2629
-mas_devops-9.5.0.dist-info/licenses/LICENSE,sha256=jDSfgHZNBkjmRfQe8jdypwyZWgkktSNfc19KPQnfEnw,14197
-mas_devops-9.5.0.dist-info/METADATA,sha256=eNwlhTIMtpbeTs386Gc_jSzwyAXvjMrNWsoVfde3PLw,5143
-mas_devops-9.5.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mas_devops-9.5.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_devops-9.5.0.dist-info/RECORD,,
+mas_devops-9.6.1.data/scripts/mas-devops-create-initial-users-for-saas,sha256=2yqUg3mzHYQeeIjTGPFo7o8x6RBs0MIb3WVwvNlwB9A,5846
+mas_devops-9.6.1.data/scripts/mas-devops-db2-validate-config,sha256=ZKM3YlVspcCi9zIgdZZPG1MC782TlpE_U5kDGqGX_us,1800
+mas_devops-9.6.1.data/scripts/mas-devops-notify-slack,sha256=RkstUWFD-hxru9DS652t-nmn4EBtNPMqdGMVTFVMSBI,4849
+mas_devops-9.6.1.data/scripts/mas-devops-saas-job-cleaner,sha256=LzKGJiBffMdxL0XyiUC94XV0omZ65xFPs_regbl6tNw,2629
+mas_devops-9.6.1.dist-info/licenses/LICENSE,sha256=jDSfgHZNBkjmRfQe8jdypwyZWgkktSNfc19KPQnfEnw,14197
+mas_devops-9.6.1.dist-info/METADATA,sha256=9O_7LutNaYQ6Tkw7U53WuNrkM4SFxNv2XyhYphdD0gg,5143
+mas_devops-9.6.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mas_devops-9.6.1.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_devops-9.6.1.dist-info/RECORD,,