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

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

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

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

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

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

@@ -165,7 +165,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         try:
             packagemanifestAPI = self.dynamicClient.resources.get(api_version="packages.operators.coreos.com/v1", kind="PackageManifest")
             packagemanifestAPI.get(name="grafana-operator", namespace="openshift-marketplace")
-            self.setParam("grafana_action", "install")
+            if self.skipGrafanaInstall:
+                self.setParam("grafana_action", "none")
+            else:
+                self.setParam("grafana_action", "install")
         except NotFoundError:
             self.setParam("grafana_action", "none")
 
@@ -842,7 +845,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                             self.fatalError(f"Unsupported format for {key} ({value}).  Expected string:int:int:boolean")
 
             # Arguments that we don't need to do anything with
-            elif key in ["accept_license", "dev_mode", "skip_pre_check", "no_confirm", "no_wait_for_pvc", "help"]:
+            elif key in ["accept_license", "dev_mode", "skip_pre_check", "skip_grafana_install", "no_confirm", "no_wait_for_pvc", "help"]:
                 pass
 
             elif key == "manual_certificates":
@@ -886,6 +889,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         # These flags work for setting params in both interactive and non-interactive modes
         if args.skip_pre_check:
             self.setParam("skip_pre_check", "true")
+        if args.skip_grafana_install:
+            self.skipGrafanaInstall = True
 
         self.installOptions = [
             {

{mas_cli-10.5.0 → mas_cli-10.6.1}/src/mas/cli/install/argParser.py

@@ -843,6 +843,12 @@ otherArgGroup.add_argument(
     action="store_true",
     help="Disable the 'pre-install-check' at the start of the install pipeline"
 )
+otherArgGroup.add_argument(
+    "--skip-grafana-install",
+    required=False,
+    action="store_true",
+    help="Skips Grafana install action"
+)
 otherArgGroup.add_argument(
     "--no-confirm",
     required=False,

{mas_cli-10.5.0 → mas_cli-10.6.1}/src/mas/cli/install/summarizer.py

@@ -32,6 +32,7 @@ class InstallSummarizerMixin():
             self.printSummary("Single Node OpenShift", "No")
 
         self.printSummary("Skip Pre-Install Healthcheck", "Yes" if self.getParam('skip_pre_check') == "true" else "No")
+        self.printSummary("Skip Grafana-Install", "Yes" if self.getParam('grafana_action') == "none" else "No")
 
     def icrSummary(self) -> None:
         self.printH2("IBM Container Registry Credentials")