mas-cli 15.10.1__py3-none-any.whl → 15.11.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.10.1"  # Python module compatible semver
+__version__ = "15.11.0"  # Python module compatible semver

mas/cli/aiservice/install/app.py

@@ -454,8 +454,11 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
                 wait = False
 
             with Halo(text='Validating OpenShift Pipelines installation', spinner=self.spinner) as h:
-                installOpenShiftPipelines(self.dynamicClient)
-                h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
+                if installOpenShiftPipelines(self.dynamicClient):
+                    h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
+                else:
+                    h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator installation failed")
+                    self.fatalError("Installation failed")
 
             with Halo(text=f'Preparing namespace ({pipelinesNamespace})', spinner=self.spinner) as h:
                 createNamespace(self.dynamicClient, pipelinesNamespace)

mas/cli/aiservice/upgrade/__init__.py

@@ -0,0 +1,11 @@
+# *****************************************************************************
+# Copyright (c) 2024, 2025 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
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+from ...cli import BaseApp  # noqa: F401

mas/cli/aiservice/upgrade/app.py

@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+# *****************************************************************************
+# Copyright (c) 2024, 2025 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
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import sys
+import logging
+import logging.handlers
+from prompt_toolkit import prompt, print_formatted_text, HTML
+from prompt_toolkit.completion import WordCompleter
+
+from halo import Halo
+
+from ...cli import BaseApp
+from ...validators import AiserviceInstanceIDValidator
+from .argParser import upgradeArgParser
+
+from mas.devops.ocp import createNamespace
+from mas.devops.mas import listAiServiceInstances, getAiserviceChannel
+from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchAiServiceUpgradePipeline
+from openshift.dynamic.exceptions import ResourceNotFoundError
+logger = logging.getLogger(__name__)
+
+
+class AiServiceUpgradeApp(BaseApp):
+    def upgrade(self, argv):
+        """
+        Upgrade AI Service instance
+        """
+        args = upgradeArgParser.parse_args(args=argv)
+        aiserviceInstanceId = args.aiservice_instance_id
+        self.noConfirm = args.no_confirm
+        self.skipPreCheck = args.skip_pre_check
+        self.licenseAccepted = args.accept_license
+        self.devMode = args.dev_mode
+
+        if aiserviceInstanceId is None:
+            self.printH1("Set Target OpenShift Cluster")
+            # Connect to the target cluster
+            self.connect()
+        else:
+            logger.debug("AI Service instance ID is set, so we assume already connected to the desired OCP")
+            # Need to lookup target architecture because configDb2 will try to access self.architecture
+            self.lookupTargetArchitecture()
+
+        if self.dynamicClient is None:
+            print_formatted_text(HTML("<Red>Error: The Kubernetes dynamic Client is not available.  See log file for details</Red>"))
+            sys.exit(1)
+
+        if aiserviceInstanceId is None:
+            # Interactive mode
+            self.printH1("AI Service Instance Selection")
+            print_formatted_text(HTML("<LightSlateGrey>Select a AI Service instance to upgrade from the list below:</LightSlateGrey>"))
+            try:
+                aiserviceInstances = listAiServiceInstances(self.dynamicClient)
+            except ResourceNotFoundError:
+                aiserviceInstances = []
+            aiserviceOptions = []
+
+            if len(aiserviceInstances) == 0:
+                print_formatted_text(HTML("<Red>Error: No AI Service instances detected on this cluster</Red>"))
+                sys.exit(1)
+
+            for aiservice in aiserviceInstances:
+                print_formatted_text(HTML(f"- <u>{aiservice['metadata']['name']}</u> v{aiservice['status']['versions']['reconciled']}"))
+                aiserviceOptions.append(aiservice['metadata']['name'])
+
+            aiserviceCompleter = WordCompleter(aiserviceOptions)
+            print()
+            aiserviceInstanceId = prompt(HTML('<Yellow>Enter AI Service instance ID: </Yellow>'), completer=aiserviceCompleter, validator=AiserviceInstanceIDValidator(), validate_while_typing=False)
+
+        currentAiserviceChannel = getAiserviceChannel(self.dynamicClient, aiserviceInstanceId)
+        if currentAiserviceChannel is not None:
+            if self.devMode:
+                # this enables upgrade of custom channel for AI service
+                nextAiserviceChannel = prompt(HTML('<Yellow>Custom channel</Yellow> '))
+            else:
+                if currentAiserviceChannel not in self.upgrade_path:
+                    self.fatalError(f"No upgrade available, {aiserviceInstanceId} is are already on the latest release {currentAiserviceChannel}")
+                nextAiserviceChannel = self.upgrade_path[currentAiserviceChannel]
+
+        if not self.licenseAccepted and not self.devMode:
+            self.printH1("License Terms")
+            self.printDescription([
+                "To continue with the upgrade, you must accept the license terms:",
+                self.licenses[nextAiserviceChannel]
+            ])
+
+            if self.noConfirm:
+                self.fatalError("You must accept the license terms with --accept-license when using the --no-confirm flag")
+            else:
+                if not self.yesOrNo("Do you accept the license terms"):
+                    exit(1)
+
+        self.printH1("Review Settings")
+        print_formatted_text(HTML(f"<LightSlateGrey>AI Service Instance ID ..................... {aiserviceInstanceId}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Current AI Service Channel ............. {currentAiserviceChannel}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Next AI Service Channel ................ {nextAiserviceChannel}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Skip Pre-Upgrade Checks ......... {self.skipPreCheck}</LightSlateGrey>"))
+
+        if not self.noConfirm:
+            print()
+            continueWithUpgrade = self.yesOrNo("Proceed with these settings")
+
+        if self.noConfirm or continueWithUpgrade:
+            self.createTektonFileWithDigest()
+
+            self.printH1("Launch Upgrade")
+            pipelinesNamespace = f"aiservice-{aiserviceInstanceId}-pipelines"
+
+            with Halo(text='Validating OpenShift Pipelines installation', spinner=self.spinner) as h:
+                if installOpenShiftPipelines(self.dynamicClient):
+                    h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
+                else:
+                    h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator installation failed")
+                    self.fatalError("Installation failed")
+
+            with Halo(text=f'Preparing namespace ({pipelinesNamespace})', spinner=self.spinner) as h:
+                createNamespace(self.dynamicClient, pipelinesNamespace)
+                h.stop_and_persist(symbol=self.successIcon, text=f"Namespace is ready ({pipelinesNamespace})")
+
+            with Halo(text=f'Installing latest Tekton definitions (v{self.version})', spinner=self.spinner) as h:
+                updateTektonDefinitions(pipelinesNamespace, self.tektonDefsPath)
+                h.stop_and_persist(symbol=self.successIcon, text=f"Latest Tekton definitions are installed (v{self.version})")
+
+            with Halo(text='Submitting PipelineRun for {aiserviceInstanceId} upgrade', spinner=self.spinner) as h:
+                pipelineURL = launchAiServiceUpgradePipeline(self.dynamicClient, aiserviceInstanceId, self.skipPreCheck, aiserviceChannel=nextAiserviceChannel, params=self.params)
+                if pipelineURL is not None:
+                    h.stop_and_persist(symbol=self.successIcon, text=f"PipelineRun for {aiserviceInstanceId} upgrade submitted")
+                    print_formatted_text(HTML(f"\nView progress:\n  <Cyan><u>{pipelineURL}</u></Cyan>\n"))
+                else:
+                    h.stop_and_persist(symbol=self.failureIcon, text=f"Failed to submit PipelineRun for {aiserviceInstanceId} upgrade, see log file for details")
+                    print()

mas/cli/aiservice/upgrade/argParser.py

@@ -0,0 +1,69 @@
+# *****************************************************************************
+# Copyright (c) 2024, 2025 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
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import argparse
+
+from ... import __version__ as packageVersion
+from ...cli import getHelpFormatter
+
+upgradeArgParser = argparse.ArgumentParser(
+    prog='mas aiservice-upgrade',
+    description="\n".join([
+        f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
+        "Upgrade AI Service by configuring and launching the AI Service Upgrade Tekton Pipeline.\n",
+        "Interactive Mode:",
+        "Omitting the --aiservice-instance-id option will trigger an interactive prompt"
+    ]),
+    epilog="Refer to the online documentation for more information: https://ibm-mas.github.io/cli/",
+    formatter_class=getHelpFormatter(),
+    add_help=False
+)
+
+masArgGroup = upgradeArgParser.add_argument_group('MAS Instance Selection')
+masArgGroup.add_argument(
+    '--aiservice-instance-id',
+    required=False,
+    help="The AI Service Instance ID to be upgraded"
+)
+
+otherArgGroup = upgradeArgParser.add_argument_group('More')
+otherArgGroup.add_argument(
+    '--skip-pre-check',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Disable the 'pre-upgrade-check' and 'post-upgrade-verify' tasks in the upgrade pipeline"
+)
+otherArgGroup.add_argument(
+    '--no-confirm',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Launch the upgrade without prompting for confirmation",
+)
+otherArgGroup.add_argument(
+    "--accept-license",
+    action="store_true",
+    default=False,
+    help="Accept all license terms without prompting"
+)
+otherArgGroup.add_argument(
+    "--dev-mode",
+    required=False,
+    action="store_true",
+    default=False,
+    help="Configure upgrade for development mode",
+)
+otherArgGroup.add_argument(
+    '-h', "--help",
+    action='help',
+    default=False,
+    help="Show this help message and exit",
+)

mas/cli/cli.py

@@ -9,6 +9,7 @@
 # *****************************************************************************
 
 import logging
+import logging.handlers
 import urllib3
 
 from argparse import RawTextHelpFormatter
@@ -118,7 +119,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "15.10.1"
+        self.version = "15.11.0"
         self.h1count = 0
         self.h2count = 0
 

mas/cli/install/app.py

@@ -1263,8 +1263,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             pipelinesNamespace = f"mas-{self.getParam('mas_instance_id')}-pipelines"
 
             with Halo(text='Validating OpenShift Pipelines installation', spinner=self.spinner) as h:
-                installOpenShiftPipelines(self.dynamicClient)
-                h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
+                if installOpenShiftPipelines(self.dynamicClient):
+                    h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
+                else:
+                    h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator installation failed")
+                    self.fatalError("Installation failed")
 
             with Halo(text=f'Preparing namespace ({pipelinesNamespace})', spinner=self.spinner) as h:
                 createNamespace(self.dynamicClient, pipelinesNamespace)

mas/cli/install/catalogs.py

@@ -9,20 +9,21 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-251030-amd64",
         "v9-251010-amd64",
         "v9-250925-amd64",
         "v9-250902-amd64",
-        "v9-250828-amd64",
     ],
     "s390x": [
+        "v9-251030-s390x",
         # No "v9-250925-s390x" catalog for the s390x
         "v9-250902-s390x",
         "v9-250828-s390x",
     ],
     "ppc64le": [
+        "v9-251030-ppc64le",
         "v9-251010-ppc64le",
         "v9-250925-ppc64le",
         "v9-250902-ppc64le",
-        "v9-250828-ppc64le",
     ],
 }

mas/cli/install/settings/db2Settings.py

@@ -157,6 +157,8 @@ class Db2SettingsMixin():
                     f"Note that the same settings are applied to both the IoT and {self.manageAppName} Db2 instances",
                     "Use existing node labels and taints to control scheduling of the Db2 workload in your cluster",
                     "For more information refer to the Red Hat documentation:",
+                    " - <Orange><u>https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/nodes/controlling-pod-placement-onto-nodes-scheduling#nodes-scheduler-node-affinity</u></Orange>",
+                    " - <Orange><u>https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/nodes/controlling-pod-placement-onto-nodes-scheduling#nodes-scheduler-taints-tolerations</u></Orange>",
                     " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
                     " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>",
                     " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
@@ -220,8 +222,8 @@ class Db2SettingsMixin():
             self.params["db2_cpu_requests"] = "300m"
 
         else:
-            self.setParam("db2_meta_storage_size", "20Gi")
-            self.setParam("db2_backup_storage_size", "100Gi")
-            self.setParam("db2_logs_storage_size", "100Gi")
-            self.setParam("db2_temp_storage_size", "100Gi")
-            self.setParam("db2_data_storage_size", "100Gi")
+            self.setParam("db2_meta_storage_size", "10Gi")
+            self.setParam("db2_backup_storage_size", "50Gi")
+            self.setParam("db2_logs_storage_size", "10Gi")
+            self.setParam("db2_temp_storage_size", "10Gi")
+            self.setParam("db2_data_storage_size", "50Gi")