mas-cli 10.4.4__tar.gz → 10.5.0__tar.gz

{mas_cli-10.4.4 → mas_cli-10.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 10.4.4
+Version: 10.5.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-10.4.4 → mas_cli-10.5.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.4.4"
+__version__ = "10.5.0"

{mas_cli-10.4.4 → mas_cli-10.5.0}/src/mas/cli/cli.py

@@ -13,13 +13,13 @@ import urllib3
 
 from argparse import RawTextHelpFormatter
 from shutil import which
-from os import path
+from os import path, environ
 from sys import exit
 
 # Use of the openshift client rather than the kubernetes client allows us access to "apply"
-from openshift import dynamic
 from kubernetes import config
-from kubernetes.client import api_client
+from kubernetes.client import api_client, Configuration
+from openshift.dynamic import DynamicClient
 from openshift.dynamic.exceptions import NotFoundError
 
 from prompt_toolkit import prompt, print_formatted_text, HTML
@@ -177,13 +177,19 @@ class BaseApp(PrintMixin, PromptMixin):
         """
         logger.debug("Reloading Kubernetes Client Configuration")
         try:
-            config.load_kube_config()
-            self._dynClient = dynamic.DynamicClient(
-                api_client.ApiClient(configuration=config.load_kube_config())
-            )
+            if "KUBERNETES_SERVICE_HOST" in environ:
+                config.load_incluster_config()
+                k8s_config = Configuration.get_default_copy()
+                self._apiClient = api_client.ApiClient(configuration=k8s_config)
+                self._dynClient = DynamicClient(self._apiClient)
+            else:
+                config.load_kube_config()
+                self._apiClient = api_client.ApiClient()
+                self._dynClient = DynamicClient(self._apiClient)
             return self._dynClient
         except Exception as e:
             logger.warning(f"Error: Unable to connect to OpenShift Container Platform: {e}")
+            logger.exception(e, stack_info=True)
             return None
 
     def connect(self):
@@ -212,7 +218,8 @@ class BaseApp(PrintMixin, PromptMixin):
             # Prompt for new connection properties
             server = prompt(HTML('<Yellow>Server URL:</Yellow> '), placeholder="https://...")
             token = prompt(HTML('<Yellow>Login Token:</Yellow> '), is_password=True, placeholder="sha256~...")
-            connect(server, token)
+            skipVerify = self.yesOrNo('Disable TLS Verify')
+            connect(server, token, skipVerify)
             self.reloadDynamicClient()
             if self._dynClient is None:
                 print_formatted_text(HTML("<Red>Unable to connect to cluster.  See log file for details</Red>"))

{mas_cli-10.4.4 → mas_cli-10.5.0}/src/mas/cli/install/app.py

@@ -59,7 +59,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             catalogDisplayName = catalog.spec.displayName
 
             m = re.match(r".+(?P<catalogId>v[89]-(?P<catalogVersion>[0-9]+)-amd64)", catalogDisplayName)
-            print(f"m: {m}")
             if m:
                 # catalogId = v8-yymmdd-amd64
                 # catalogVersion = yymmdd
@@ -184,7 +183,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     def configCP4D(self):
         # TODO: It's probably time to remove v8-amd64 support from the CLI entirely now
-        if self.getParam("mas_catalog_version") in ["v8-amd64", "v9-240625-amd64"]:
+        if self.getParam("mas_catalog_version") in ["v8-amd64", "v9-240625-amd64", "v9-240730-amd64"]:
             self.setParam("cpd_product_version", "4.8.0")
         elif self.getParam("mas_catalog_version") in ["v8-240528-amd64"]:
             self.setParam("cpd_product_version", "4.6.6")
@@ -891,6 +890,45 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.installOptions = [
             {
                 "#": 1,
+                "catalog": "v9-240730-amd64",
+                "release": "9.0.x",
+                "core": "9.0.1",
+                "assist": "9.0.1",
+                "iot": "9.0.1",
+                "manage": "9.0.1",
+                "monitor": "9.0.1",
+                "optimizer": "9.0.1",
+                "predict": "9.0.0",
+                "inspection": "9.0.0"
+            },
+            {
+                "#": 2,
+                "catalog": "v9-240730-amd64",
+                "release": "8.11.x",
+                "core": "8.11.13",
+                "assist": "8.8.5",
+                "iot": "8.8.11",
+                "manage": "8.7.10",
+                "monitor": "8.11.9",
+                "optimizer": "8.5.7",
+                "predict": "8.9.3",
+                "inspection": "8.9.4"
+            },
+            {
+                "#": 3,
+                "catalog": "v9-240730-amd64",
+                "release": "8.10.x",
+                "core": "8.10.16",
+                "assist": "8.7.6",
+                "iot": "8.7.15",
+                "manage": "8.6.16",
+                "monitor": "8.10.12",
+                "optimizer": "8.4.8",
+                "predict": "8.8.3",
+                "inspection": "8.8.4"
+            },
+            {
+                "#": 4,
                 "catalog": "v9-240625-amd64",
                 "release": "9.0.x",
                 "core": "9.0.0",
@@ -903,7 +941,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "inspection": "9.0.0"
             },
             {
-                "#": 2,
+                "#": 5,
                 "catalog": "v9-240625-amd64",
                 "release": "8.11.x",
                 "core": "8.11.12",
@@ -916,7 +954,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "inspection": "8.9.3"
             },
             {
-                "#": 3,
+                "#": 6,
                 "catalog": "v9-240625-amd64",
                 "release": "8.10.x",
                 "core": "8.10.15",
@@ -929,7 +967,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "inspection": "8.8.4"
             },
             {
-                "#": 4,
+                "#": 7,
                 "catalog": "v8-240528-amd64",
                 "release": "8.11.x",
                 "core": "8.11.11",
@@ -942,7 +980,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "inspection": "8.9.3"
             },
             {
-                "#": 5,
+                "#": 8,
                 "catalog": "v8-240528-amd64",
                 "release": "8.10.x",
                 "core": "8.10.14",