mas-cli 21.8.2__tar.gz → 21.9.1__tar.gz

{mas_cli-21.8.2/python/src/mas_cli.egg-info → mas_cli-21.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 21.8.2
+Version: 21.9.1
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0
@@ -21,7 +21,6 @@ Requires-Dist: mas-devops>=9.0.0
 Requires-Dist: alive-progress
 Requires-Dist: halo
 Requires-Dist: prompt_toolkit
-Requires-Dist: openshift
 Requires-Dist: kubernetes==33.1.0
 Requires-Dist: tabulate
 Requires-Dist: prettytable

{mas_cli-21.8.2 → mas_cli-21.9.1}/pyproject.toml

@@ -21,7 +21,6 @@ dependencies = [
   "alive-progress",
   "halo",
   "prompt_toolkit",
-  "openshift",
   "kubernetes == 33.1.0",
   "tabulate",
   "prettytable",
@@ -86,7 +85,12 @@ max-line-length = 160
 
 [tool.basedpyright]
 # Only check must-gather module during gradual rollout
-include = ["python/tests/unit/must_gather"]
+include = [
+  "python/src/mas/cli/must_gather",
+  "python/src/mas/cli/update",
+  "python/src/mas/cli/upgrade",
+  "python/tests/unit/must_gather"
+]
 
 # Use "basic" mode - focuses on our code, lenient with untyped dependencies
 # Options: "off", "basic", "standard", "strict"

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/__init__.py

@@ -10,4 +10,4 @@
 
 from .cli import BaseApp  # noqa: F401
 
-__version__ = "21.8.2"  # Python module compatible semver
+__version__ = "21.9.1"  # Python module compatible semver

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/__main__.py

@@ -12,7 +12,6 @@ import logging
 from sys import argv
 
 from jinja2.exceptions import TemplateNotFound
-from kubeconfig.exceptions import KubectlCommandError
 from kubernetes.client.exceptions import ApiException
 from prompt_toolkit import HTML, print_formatted_text
 from urllib3.exceptions import MaxRetryError
@@ -161,12 +160,6 @@ def main() -> None:
         else:
             logger.error("Could not find template", exc_info=exception)
             raise SystemExit(1) from exception
-    except KubectlCommandError as exception:
-        if app:
-            app.fatalError("Could not execute kubectl command", exception=exception)
-        else:
-            logger.error("Could not execute kubectl command", exc_info=exception)
-            raise SystemExit(1) from exception
 
 
 if __name__ == "__main__":

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/aiservice/install/app.py

@@ -17,7 +17,7 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from sys import exit
 from os import path, getenv
-from openshift.dynamic.exceptions import NotFoundError
+from kubernetes.dynamic.exceptions import NotFoundError
 from prompt_toolkit import prompt, print_formatted_text, HTML
 from prompt_toolkit.completion import WordCompleter
 from tabulate import tabulate

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/aiservice/upgrade/app.py

@@ -24,7 +24,7 @@ from .argParser import upgradeArgParser
 from mas.devops.ocp import createNamespace
 from mas.devops.aiservice import listAiServiceInstances, getAiserviceChannel
 from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchAiServiceUpgradePipeline
-from openshift.dynamic.exceptions import ResourceNotFoundError
+from kubernetes.dynamic.exceptions import ResourceNotFoundError
 
 logger = logging.getLogger(__name__)
 
@@ -69,8 +69,11 @@ class AiServiceUpgradeApp(BaseApp):
                 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"])
+                instanceId = aiservice["metadata"]["name"]
+                reconciledVersion = self.getReconciledVersion(aiservice)
+
+                print_formatted_text(HTML(f"- <u>{instanceId}</u> v{reconciledVersion}"))
+                aiserviceOptions.append(instanceId)
 
             aiserviceCompleter = WordCompleter(aiserviceOptions)
             print()

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/backup/app.py

@@ -15,7 +15,7 @@ from halo import Halo
 from prompt_toolkit import prompt, print_formatted_text, HTML
 from prompt_toolkit.completion import WordCompleter
 
-from openshift.dynamic.exceptions import ResourceNotFoundError
+from kubernetes.dynamic.exceptions import ResourceNotFoundError
 
 from ..cli import BaseApp
 from ..validators import InstanceIDValidator, StorageClassValidator
@@ -270,7 +270,10 @@ class BackupApp(BaseApp):
             instances = listMasInstances(self.dynamicClient)
             self.printDescription(["The following MAS instances are installed on the target cluster:"])
             for instance in instances:
-                self.printDescription([f"- <u>{instance['metadata']['name']}</u> v{instance['status']['versions']['reconciled']}"])
+                instanceId = instance["metadata"]["name"]
+                reconciledVersion = self.getReconciledVersion(instance)
+
+                self.printDescription([f"- <u>{instanceId}</u> v{reconciledVersion}"])
             return True
         except ResourceNotFoundError:
             self.printDescription(["No MAS instances were detected on the cluster (Suite.core.mas.ibm.com/v1 API is not available)"])
@@ -284,13 +287,18 @@ class BackupApp(BaseApp):
                 self.fatalError("No MAS instances found on the cluster")
             elif len(instances) == 1:
                 instanceId = instances[0]["metadata"]["name"]
+                reconciledVersion = self.getReconciledVersion(instances[0])
+
                 self.setParam("mas_instance_id", instanceId)
                 self.printDescription([f"Using MAS instance: <u>{instanceId}</u>"])
             else:
                 instanceOptions = []
                 for instance in instances:
-                    self.printDescription([f"- <u>{instance['metadata']['name']}</u> v{instance['status']['versions']['reconciled']}"])
-                    instanceOptions.append(instance["metadata"]["name"])
+                    instanceId = instance["metadata"]["name"]
+                    reconciledVersion = self.getReconciledVersion(instance)
+
+                    self.printDescription([f"- <u>{instanceId}</u> v{reconciledVersion}"])
+                    instanceOptions.append(instanceId)
 
                 instanceCompleter = WordCompleter(instanceOptions)
                 print()

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/cli.py

@@ -21,12 +21,11 @@ import threading
 import json
 from typing import List, Dict, Any, Callable, Type, NoReturn
 
-# Use of the openshift client rather than the kubernetes client allows us access to "apply"
 from kubernetes import config
 from kubernetes.client.api_client import ApiClient
 from kubernetes.client import Configuration
-from openshift.dynamic import DynamicClient
-from openshift.dynamic.exceptions import NotFoundError
+from kubernetes.dynamic import DynamicClient
+from kubernetes.dynamic.exceptions import NotFoundError
 
 from prompt_toolkit import prompt, print_formatted_text, HTML
 
@@ -127,7 +126,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "21.8.2"
+        self.version: str = "21.9.1"
         self.h1count: int = 0
         self.h2count: int = 0
 
@@ -427,6 +426,35 @@ class BaseApp(PrintMixin, PromptMixin):
             logger.exception(e, stack_info=True)
             return None
 
+    def getReconciledVersion(self, instance: Dict[str, Any]) -> str:
+        """
+        Get the reconciled version from an instance's status.
+
+        Checks if the instance is in a healthy state by verifying the presence of a reconciled version.
+        If the instance is unhealthy (missing reconciled version), triggers a fatal error with a clear message.
+
+        Args:
+            instance (dict): The instance resource dictionary containing metadata, kind, and status
+
+        Returns:
+            str: The reconciled version if the instance is healthy
+
+        Raises:
+            SystemExit: Via fatalError if the instance is unhealthy
+        """
+        instanceId = instance["metadata"]["name"]
+        instanceKind = instance.get("kind", "Instance")
+        reconciledVersion = instance.get("status", {}).get("versions", {}).get("reconciled")
+
+        if not reconciledVersion:
+            self.fatalError(
+                f"{instanceKind} '{instanceId}' is in an unhealthy state (missing reconciled version). "
+                f"We do not recommend (and thus do not support) continuing when there are unhealthy instances on the cluster. "
+                f"Please resolve the instance health issues before attempting to proceed."
+            )
+
+        return reconciledVersion
+
     @logMethodCall
     def connect(self) -> None:
         promptForNewServer = False

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/install/app.py

@@ -17,7 +17,8 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 import re
 import calendar
-from openshift.dynamic.exceptions import NotFoundError
+from kubernetes.dynamic.exceptions import NotFoundError
+from urllib3.exceptions import MaxRetryError
 
 from typing import Dict, Any
 
@@ -181,6 +182,8 @@ class InstallApp(
                     ]
                 )
             )
+        except MaxRetryError:
+            self.fatalError("Unable to connect to the Kubernetes API server. Please verify cluster connectivity and try again.")
 
     @logMethodCall
     def licensePrompt(self):
@@ -270,11 +273,8 @@ class InstallApp(
 
         # Generate catalogTable
         for application, key in applications.items():
-            # Add 9.1-feature channel based off 9.0 to those apps that have not onboarded yet
             if key in self.chosenCatalog:
                 tempChosenCatalog = self.chosenCatalog[key].copy()
-                if "9.1.x-feature" not in tempChosenCatalog and "9.0.x" in tempChosenCatalog:
-                    tempChosenCatalog.update({"9.1.x-feature": tempChosenCatalog["9.0.x"]})
 
                 self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
 
@@ -1295,7 +1295,7 @@ class InstallApp(
             self.installFacilities = False
 
         # AI Service is only installable on Manage 9.x as AI Config Application is not supported on Manage 8.x
-        if isVersionEqualOrAfter("9.0.0", self.getParam("mas_app_channel_manage")):
+        if self.getParam("mas_app_channel_manage") != "" and isVersionEqualOrAfter("9.0.0", self.getParam("mas_app_channel_manage")):
             self.installAIService = self.yesOrNo("Install AI Service")
             if self.installAIService:
                 self.configAIService()
@@ -1323,8 +1323,11 @@ class InstallApp(
                 "  - ReadWriteOnce volumes can be mounted as read-write by multiple pods on a single node.",
                 "  - ReadWriteMany volumes can be mounted as read-write by multiple pods across many nodes.",
                 "",
+                "Note: Remote file systems are often slower than local file systems, using a storage class backed by a remote file system (e.g. NFS) as the RWO storage class may result in degraded performance",
+                "",
             ]
         )
+
         defaultStorageClasses = getDefaultStorageClasses(self.dynamicClient)
         if defaultStorageClasses.provider is not None:
             print_formatted_text(HTML(f"<MediumSeaGreen>Storage provider auto-detected: {defaultStorageClasses.providerName}</MediumSeaGreen>"))
@@ -2367,7 +2370,6 @@ class InstallApp(
                 self.fatalError(f"Unknown option: {key} {value}")
 
         if self.installManage:
-
             # Configure Storage and Access mode
             self.manageStorageAndAccessMode()
 

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/install/settings/aiSettings.py

@@ -62,11 +62,10 @@ class AiSettingsMixin:
 
         def generateAiCfg(self, instanceId: str, scope: str, destination: str, workspaceId: str = "") -> None: ...
 
-    def configAi(self, silentMode=False) -> None:
+    def configAi(self) -> None:
         """Configure AiCfg for MAS installation"""
 
-        # FIRST: Check MAS version - AiCfg is only supported in MAS 9.2+
-        # This must be done BEFORE checking user preferences to prevent errors on 9.1
+        # AiCfg is only supported in MAS 9.2+
         mas_channel = self.getParam("mas_channel")
         is_mas_92_or_later = False
 
@@ -83,44 +82,22 @@ class AiSettingsMixin:
 
         # If MAS 9.1 or earlier, force disable AiCfg regardless of user input
         if not is_mas_92_or_later:
-            if not silentMode:
-                self.printH1("Configure AiCfg")
-                self.printDescription(
-                    [
-                        "⚠️  IMPORTANT: AiCfg is only available in MAS 9.2 and later.",
-                        f"   Your MAS channel is: {mas_channel or 'not set'}",
-                        "",
-                        "AiCfg configuration will be skipped.",
-                        "If you upgrade to MAS 9.2+ in the future, you can configure AiCfg then.",
-                    ]
-                )
-            self.setParam("configure_aiassistant", "none")
-            print_formatted_text("⚠️  AiCfg configuration skipped (requires MAS 9.2+)")
             return
 
-        # MAS 9.2+ - proceed with normal configuration
-        if not silentMode:
-            self.printH1("Configure AiCfg")
-            self.printDescription(
-                [
-                    "The installer can configure AiCfg integration for your MAS instance.",
-                    "AiCfg provides AI/ML capabilities for MAS applications like Manage, Monitor, and Predict.",
-                    "AiCfg is configured at system scope and available to all workspaces.",
-                ]
-            )
+        self.printH1("Maximo AI Configuration")
+        self.printDescription(
+            [
+                "The installer can configure AiCfg integration for your MAS instance.",
+                "AiCfg provides AI/ML capabilities for MAS applications like Manage, Monitor, and Predict.",
+                "AiCfg is configured at system scope and available to all workspaces.",
+            ]
+        )
 
         # Ask if user wants to configure AiCfg
-        if not silentMode:
-            # Interactive mode - ask user
-            configureAi = self.yesOrNo("Do you want to configure AiCfg")
-        else:
-            # Silent mode - check if explicitly requested via parameter
-            # Default to False (skip) unless parameter says otherwise
-            configureAi = self.getParam("configure_aiassistant") not in [None, "none", ""]
+        configureAi = self.yesOrNo("Do you want to configure AiCfg")
 
         if not configureAi:
             self.setParam("configure_aiassistant", "none")
-            print_formatted_text("AiCfg configuration skipped")
             return
 
         instanceId = self.getParam("mas_instance_id")
@@ -132,50 +109,14 @@ class AiSettingsMixin:
 
         # Check if AI Service is being installed on the same cluster
         if hasattr(self, "installAIService") and self.installAIService:
-            # AI Service will be installed - defer AiCfg generation to pipeline
-            if not silentMode:
-                self.printH2("AiCfg Configuration (Automatic)")
-                self.printDescription(
-                    [
-                        "AI Service is being installed on this cluster.",
-                        "The AiCfg will be automatically generated and applied by the pipeline",
-                        "AFTER AI Service installation completes.",
-                        "",
-                        "The pipeline will:",
-                        "  1. Install AI Service first",
-                        "  2. Auto-detect connection details (URL, API key, certificate)",
-                        "  3. Generate and apply AiCfg automatically",
-                        "",
-                        "No manual configuration needed!",
-                    ]
-                )
-
             # Set action to indicate pipeline should handle it
             self.setParam("configure_aiassistant", "pipeline")
             print_formatted_text("\n✓ AiCfg will be automatically configured by the pipeline after AI Service installation")
         else:
             # Manual configuration for external AI Service
-            if not silentMode:
-                self.printH2("AiCfg Configuration")
-                self.printDescription(
-                    [
-                        "You can provide connection details for an existing AI Service instance.",
-                        "The installer will generate the AiCfg YAML file with your connection details.",
-                        "",
-                        "IMPORTANT: The AiCfg file must be applied AFTER the MAS Core operator is installed,",
-                        "as the AiCfg CRD is created by the operator (not during initial config phase).",
-                        "Do NOT include this file in the initial configuration directory.",
-                        "Apply it after the operator creates the CRD.",
-                    ]
-                )
-
-            createAiConfig = True
-            if not silentMode:
-                createAiConfig = self.yesOrNo("Generate AiCfg configuration file (apply after operator install)")
-
+            createAiConfig = self.yesOrNo("Generate AiCfg configuration file (apply after operator install)")
             if createAiConfig:
                 self.setParam("configure_aiassistant", "configure")
-
                 self.selectLocalConfigDir()
 
                 # Check if a configuration already exists before creating a new one

{mas_cli-21.8.2 → mas_cli-21.9.1}/python/src/mas/cli/install/settings/db2Settings.py

@@ -12,6 +12,8 @@ from os import path
 from typing import TYPE_CHECKING, Dict, List, Any
 from prompt_toolkit import print_formatted_text
 
+from mas.devops.utils import isVersionEqualOrAfter
+
 if TYPE_CHECKING:
     # Type hints for methods and attributes provided by other mixins
     # These are only used during type checking and have no runtime cost
@@ -25,6 +27,7 @@ class Db2SettingsMixin:
         params: Dict[str, str]
         devMode: bool
         installIoT: bool
+        installMonitor: bool
         installManage: bool
         installFacilities: bool
         manageAppName: str
@@ -100,8 +103,6 @@ class Db2SettingsMixin:
         # Determine which application requires the system database based on Monitor version
         # For Monitor >= 9.2.0: Monitor requires system Db2
         # For Monitor < 9.2.0: IoT requires system Db2 (original behavior)
-        from mas.devops.utils import isVersionEqualOrAfter
-
         monitorChannel = self.getParam("mas_app_channel_monitor")
         useNewDependency = monitorChannel and isVersionEqualOrAfter("9.2.0", monitorChannel)
         instanceId = self.getParam("mas_instance_id")