mas-cli 13.5.0__py3-none-any.whl → 13.7.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.5.0"  # Python module compatible semver
+__version__ = "13.7.0"  # Python module compatible semver

mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "13.5.0"
+        self.version = "13.7.0"
         self.h1count = 0
         self.h2count = 0
 

mas/cli/install/app.py

@@ -723,12 +723,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.showAdvancedOptions and self.installPredict:
             self.printH1("Configure Maximo Predict")
             self.printDescription([
-                "Predict application supports integration with IBM SPSS and Watson Openscale which are optional services installed on top of IBM Cloud Pak for Data",
+                "Predict application supports integration with IBM SPSS which is an optional service installed on top of IBM Cloud Pak for Data",
                 "Unless requested these will not be installed"
             ])
             self.configCP4D()
             self.yesOrNo("Install IBM SPSS Statistics", "cpd_install_spss")
-            self.yesOrNo("Install Watson OpenScale", "cpd_install_openscale")
 
     @logMethodCall
     def assistSettings(self) -> None:
@@ -758,7 +757,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             " - Customize Maximo Manage database settings (schema, tablespace, indexspace)",
             " - Customize Maximo Manage server bundle configuration (defaults to \"all\" configuration)",
             " - Enable optional Maximo Manage integration Cognos Analytics and Watson Studio Local",
-            " - Enable optional Maximo Predict integration with SPSS and Watson OpenScale",
+            " - Enable optional Maximo Predict integration with SPSS",
             " - Enable optional IBM Turbonomic integration",
             " - Customize Db2 node affinity and tolerations, memory, cpu, and storage settings (when using the IBM Db2 Universal Operator)",
             " - Choose alternative Apache Kafka providers (default to Strimzi)",
@@ -1141,7 +1140,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     instanceId=self.getParam("mas_instance_id"),
                     storageClass=self.pipelineStorageClass,
                     accessMode=self.pipelineStorageAccessMode,
-                    waitForBind=wait
+                    waitForBind=wait,
+                    configureRBAC=(self.getParam("service_account_name") == "")
                 )
                 prepareInstallSecrets(
                     dynClient=self.dynamicClient,

mas/cli/install/argBuilder.py

@@ -237,8 +237,6 @@ class installArgBuilderMixin():
             command += f"  --cp4d-version \"{self.getParam('cpd_product_version')}\""
             if self.getParam('cpd_install_spss') == "install":
                 command += " --cp4d-install-spss"
-            if self.getParam('cpd_install_openscale') == "install":
-                command += " --cp4d-install-openscal"
             if self.getParam('cpd_install_cognos') == "install":
                 command += " --cp4d-install-cognos"
             if self.getParam('cpd_install_ws') == "install":
@@ -409,6 +407,8 @@ class installArgBuilderMixin():
             command += f"  --skip-grafana-install{newline}"
         if self.getParam('image_pull_policy') != "":
             command += f"  --image-pull-policy {self.getParam('image_pull_policy')}{newline}"
+        if self.getParam('service_account_name') != "":
+            command += f"  --service-account {self.getParam('service_account_name')}{newline}"
 
         command += "  --accept-license --no-confirm"
         return command

mas/cli/install/argParser.py

@@ -706,14 +706,6 @@ cpdAppsArgGroup.add_argument(
     action="store_const",
     const="install"
 )
-cpdAppsArgGroup.add_argument(
-    "--cp4d-install-openscale",
-    dest="cpd_install_openscale",
-    required=False,
-    help="Add Watson Openscale as part of Cloud Pak for Data",
-    action="store_const",
-    const="install"
-)
 cpdAppsArgGroup.add_argument(
     "--cp4d-install-cognos",
     dest="cpd_install_cognos",
@@ -1184,6 +1176,12 @@ otherArgGroup.add_argument(
     required=False,
     help="Manually set the image pull policy used in the Tekton Pipeline",
 )
+otherArgGroup.add_argument(
+    "--service-account",
+    dest="service_account_name",
+    required=False,
+    help="Run the install pipeline under a custom service account (also disables creation of the default 'pipeline' service account)",
+)
 
 otherArgGroup.add_argument(
     "-h", "--help",

mas/cli/install/params.py

@@ -29,6 +29,7 @@ requiredParams = [
 optionalParams = [
     # Pipeline
     "image_pull_policy",
+    "service_account_name",
     # OpenShift
     "ocp_ingress_tls_secret_name",
     # MAS
@@ -95,7 +96,6 @@ optionalParams = [
     # CP4D
     "cpd_product_version",
     "cpd_install_cognos",
-    "cpd_install_openscale",
     "cpd_install_spss",
     "cpd_install_ws",
     "cpd_install_wml",

mas/cli/install/summarizer.py

@@ -18,6 +18,11 @@ logger = logging.getLogger(__name__)
 
 class InstallSummarizerMixin():
     def ocpSummary(self) -> None:
+        self.printH2("Pipeline Configuration")
+        self.printParamSummary("Service Account", "service_account_name")
+        self.printParamSummary("Image Pull Policy", "image_pull_policy")
+        self.printSummary("Skip Pre-Install Healthcheck", "Yes" if self.getParam('skip_pre_check') == "true" else "No")
+
         self.printH2("OpenShift Container Platform")
         self.printSummary("Worker Node Architecture", self.architecture)
         self.printSummary("Storage Class Provider", self.storageClassProvider)
@@ -32,9 +37,6 @@ class InstallSummarizerMixin():
         else:
             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 masSummary(self) -> None:
         operationalModeNames = ["", "Production", "Non-Production"]
 
@@ -257,7 +259,6 @@ class InstallSummarizerMixin():
                 self.printSummary("Watson Machine Learning", "Install" if self.getParam("cpd_install_wml") == "true" else "Do Not Install")
                 self.printSummary("Analytics Engine", "Install" if self.getParam("cpd_install_ae") == "true" else "Do Not Install")
 
-            self.printSummary("Watson Openscale", "Install" if self.getParam("cpd_install_openscale") == "true" else "Do Not Install")
             self.printSummary("SPSS Modeler", "Install" if self.getParam("cpd_install_spss") == "true" else "Do Not Install")
             self.printSummary("Cognos Analytics", "Install" if self.getParam("cpd_install_cognos") == "true" else "Do Not Install")