mas-cli 20.1.0__tar.gz → 20.2.0__tar.gz

{mas_cli-20.1.0/src/mas_cli.egg-info → mas_cli-20.2.0}/PKG-INFO

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

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/__init__.py

@@ -8,4 +8,6 @@
 #
 # *****************************************************************************
 
-__version__ = "20.1.0"  # Python module compatible semver
+from .cli import BaseApp  # noqa: F401
+
+__version__ = "20.2.0"  # Python module compatible semver

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/cli.py

@@ -120,12 +120,17 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "20.1.0"
+        self.version: str = "20.2.0"
         self.h1count: int = 0
         self.h2count: int = 0
 
         self.localConfigDir: str | None = None
+        self.cliRootDir: str = path.join(path.abspath(path.dirname(__file__)), "..", "..", "..", "..")
         self.templatesDir: str = path.join(path.abspath(path.dirname(__file__)), "templates")
+        self.installRBACDir: str = path.join(self.cliRootDir, "rbac", "install")
+        if not path.isfile(path.join(self.installRBACDir, "kustomization.yaml")):
+            logger.error(f"Could not find install RBAC bundle at {self.installRBACDir}, this is required for the setup-rbac command")
+            self.installRBACDir = "/opt/app-root/src/rbac/install"
         self.tektonDefsWithoutDigestPath: str = path.join(self.templatesDir, "ibm-mas-tekton.yaml")
         self.tektonDefsWithDigestPath: str = path.join(self.templatesDir, "ibm-mas-tekton-with-digest.yaml")
 
@@ -155,6 +160,7 @@ class BaseApp(PrintMixin, PromptMixin):
                 "visualinspection": ["9.2.x-feature", "9.1.x"],
                 "iot": ["9.2.x-feature", "9.1.x"],
                 "monitor": ["9.2.x-feature", "9.1.x"],
+                "predict": ["9.2.x-feature", "9.1.x"],
                 "facilities": ["9.2.x-feature", "9.1.x"],
             },
             "9.1.x": {

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/displayMixins.py

@@ -12,7 +12,7 @@ from os import getenv
 from prompt_toolkit import prompt, print_formatted_text, HTML, PromptSession
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.validation import Validator
-from typing import List
+from typing import List, Union, Optional
 
 from .validators import YesNoValidator, IntValidator, FileExistsValidator, DirectoryExistsValidator
 
@@ -47,7 +47,7 @@ class PrintMixin():
         content[len(content) - 1] = f"{content[len(content) - 1]}</{DESCRIPTIONCOLOR}>"
         print_formatted_text(HTML("\n".join(content).replace(' & ', ' &amp; ')))
 
-    def printHighlight(self, message: str | list[str]) -> None:
+    def printHighlight(self, message: Union[str, List[str]]) -> None:
         if isinstance(message, list):
             message = "\n".join(message)
 
@@ -75,6 +75,37 @@ class PrintMixin():
             logger.debug(f"Parameter Summary: {param} = {self.getParam(param)}")  # type: ignore
             self.printSummary(message, self.getParam(param))  # type: ignore
 
+    def printTable(self, headers: List[str], rows: List[List[str]]) -> None:
+        """
+        Print a formatted table with headers and rows.
+
+        Args:
+            headers: List of column headers
+            rows: List of rows, where each row is a list of column values
+        """
+        if not rows:
+            return
+
+        # Calculate column widths
+        col_widths = [len(h) for h in headers]
+        for row in rows:
+            for i, cell in enumerate(row):
+                if i < len(col_widths):
+                    col_widths[i] = max(col_widths[i], len(str(cell)))
+
+        # Print header
+        header_line = "  " + " | ".join(h.ljust(col_widths[i]) for i, h in enumerate(headers))
+        print_formatted_text(HTML(f"<{SUMMARYCOLOR}>{header_line}</{SUMMARYCOLOR}>"))
+
+        # Print separator
+        separator = "  " + "-+-".join("-" * w for w in col_widths)
+        print_formatted_text(HTML(f"<{SUMMARYCOLOR}>{separator}</{SUMMARYCOLOR}>"))
+
+        # Print rows
+        for row in rows:
+            row_line = "  " + " | ".join(str(cell).ljust(col_widths[i]) for i, cell in enumerate(row))
+            print_formatted_text(HTML(f"<{SUMMARYCOLOR}>{row_line.replace(' & ', ' & ')}</{SUMMARYCOLOR}>"))
+
 
 def masPromptYesOrNo(message: str) -> HTML:
     return HTML(f"<{PROMPTCOLOR}>{message.replace(' & ', ' &amp; ')}? [y/n]</{PROMPTCOLOR}> ")
@@ -85,7 +116,7 @@ def masPromptValue(message: str) -> HTML:
 
 
 class PromptMixin():
-    def yesOrNo(self, message: str, param: str | None = None) -> bool:
+    def yesOrNo(self, message: str, param: Optional[str] = None) -> bool:
         response = prompt(message=masPromptYesOrNo(message), validator=YesNoValidator(), validate_while_typing=False)
         responseAsBool = response.lower() in ["y", "yes"]
 
@@ -93,7 +124,7 @@ class PromptMixin():
             self.params[param] = "true" if responseAsBool else "false"  # type: ignore
         return responseAsBool
 
-    def promptForString(self, message: str, param: str | None = None, default: str = "", isPassword: bool = False, validator: Validator | None = None, completer: WordCompleter | None = None) -> str:
+    def promptForString(self, message: str, param: Optional[str] = None, default: str = "", isPassword: bool = False, validator: Optional[Validator] = None, completer: Optional[WordCompleter] = None) -> str:
         if param is not None and default == "":
             default = getenv(param.upper(), default="")
 
@@ -107,7 +138,7 @@ class PromptMixin():
             self.params[param] = response  # type: ignore
         return response
 
-    def promptForInt(self, message: str, param: str | None = None, default: int | None = None, min: int | None = None, max: int | None = None) -> int:
+    def promptForInt(self, message: str, param: Optional[str] = None, default: Optional[int] = None, min: Optional[int] = None, max: Optional[int] = None) -> int:
         if param is not None and default is None:
             default = getenv(param.upper(), default=None)  # type: ignore
 
@@ -119,7 +150,7 @@ class PromptMixin():
             self.params[param] = str(response)  # type: ignore
         return response
 
-    def promptForListSelect(self, message: str, options: List[str], param: str | None = None, default: int | None = None) -> str:
+    def promptForListSelect(self, message: str, options: List[str], param: Optional[str] = None, default: Optional[int] = None) -> str:
         selection = self.promptForInt(message=message, default=default, min=1, max=len(options))
         # List indices are 0 origin, so we need to subtract 1 from the selection made to arrive at the correct value
         result = options[selection - 1]
@@ -140,5 +171,3 @@ class PromptMixin():
             return prompt(message=masPromptValue(message), validator=DirectoryExistsValidator(), validate_while_typing=False, default=default)
         else:
             return prompt(message=masPromptValue(message), default=default)
-
-# Made with Bob

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/app.py

@@ -64,6 +64,7 @@ from mas.devops.sls import findSLSByNamespace
 from mas.devops.data import getCatalog, getCatalogEditorial, NoSuchCatalogError
 from mas.devops.tekton import (
     installOpenShiftPipelines,
+    enablePipelinesConsolePlugin,
     updateTektonDefinitions,
     preparePipelinesNamespace,
     prepareInstallSecrets,
@@ -591,6 +592,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.configCATrust()
         self.configDNSAndCerts()
         self.configRoutingMode()
+        self.configServiceMesh()
         self.configSSOProperties()
         self.configSpecialCharacters()
         self.configReportAdoptionMetricsFlag()
@@ -836,6 +838,17 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             logger.warning(f"User may not have permissions to configure IngressController '{controllerName}': {e}")
             return False
 
+    @logMethodCall
+    def configServiceMesh(self) -> None:
+        if self.showAdvancedOptions:
+            self.printH1("Configure Service Mesh")
+            self.printDescription([
+                "By default, Maximo Application Suite does not use Service Mesh for routing."
+            ])
+            self.yesOrNo("Use Service Mesh", "mas_use_service_mesh")
+        else:
+            self.setParam("mas_use_service_mesh", "false")
+
     @logMethodCall
     def configAnnotations(self):
         if self.operationalMode == 2:
@@ -2111,6 +2124,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator installation failed")
                     self.fatalError("Installation failed")
 
+            # Enable console plugin for OCP 4.21+
+            with Halo(text='Enabling Pipelines console plugin', spinner=self.spinner) as h:
+                if enablePipelinesConsolePlugin(self.dynamicClient):
+                    h.stop_and_persist(symbol=self.successIcon, text="Pipelines console plugin enabled")
+                else:
+                    h.stop_and_persist(symbol=self.warningIcon, text="Failed to enable Pipelines console plugin (non-fatal)")
+                    # Note: This is non-fatal as the plugin can be enabled manually
+
             if self.getParam("mas_routing_mode") == "path" and self.getParam("mas_configure_ingress") == "true":
                 with Halo(text='Configuring cluster for path-based routing', spinner=self.spinner) as h:
                     ingressControllerName = self.getParam("mas_ingress_controller_name") if self.getParam("mas_ingress_controller_name") else "default"

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/argBuilder.py

@@ -107,6 +107,9 @@ class installArgBuilderMixin():
         if self.getParam('mas_configure_ingress').lower() == "true":
             command += f"  --configure-ingress{newline}"
 
+        if self.getParam('mas_use_service_mesh') != "":
+            command += f"  --servicemesh \"{self.getParam('mas_use_service_mesh')}\"{newline}"
+
         if self.getParam('mas_domain') != "":
             command += f"  --domain \"{self.getParam('mas_domain')}\"{newline}"
 

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/argParser.py

@@ -184,6 +184,13 @@ masAdvancedArgGroup.add_argument(
     required=False,
     help="Name of the IngressController to use for path-based routing (default: 'default')"
 )
+masAdvancedArgGroup.add_argument(
+    "--servicemesh",
+    dest="mas_use_service_mesh",
+    required=False,
+    help="Configure MAS to use Service Mesh networking (default: false)",
+    choices=["true", "false"]
+)
 masAdvancedArgGroup.add_argument(
     "--manual-certificates",
     required=False,
@@ -734,6 +741,7 @@ facilitiesArgGroup.add_argument(
     dest="mas_ws_facilities_app_om_upgrade_mode",
     required=False,
     help="Sets the Application Object Migration Mode",
+    default="manual",
     choices=FACILITIES_APPOMUPGRADEMODE,
     metavar="{manual,load-only,automatic}"
 )
@@ -742,6 +750,7 @@ facilitiesArgGroup.add_argument(
     dest="mas_ws_facilities_size",
     required=False,
     help="Size of Facilities deployment",
+    default="small",
     choices=FACILITIES_SIZES,
     metavar="{small,medium,large}"
 )
@@ -750,6 +759,7 @@ facilitiesArgGroup.add_argument(
     dest="mas_ws_facilities_pull_policy",
     required=False,
     help="Image pull policy for Facilities",
+    default="IfNotPresent",
     choices=IMAGE_PULL_POLICIES,
     metavar="{IfNotPresent,Always}"
 )
@@ -797,13 +807,15 @@ facilitiesArgGroup.add_argument(
     "--facilities-log-storage-mode",
     dest="mas_ws_facilities_storage_log_mode",
     required=False,
-    help="Storage mode for Facilities logs"
+    help="Storage mode for Facilities logs",
+    default="ReadWriteMany",
 )
 facilitiesArgGroup.add_argument(
     "--facilities-log-storage-size",
     dest="mas_ws_facilities_storage_log_size",
     required=False,
-    help="Storage size for Facilities logs"
+    help="Storage size for Facilities logs",
+    default=30
 )
 facilitiesArgGroup.add_argument(
     "--facilities-userfiles-storage-class",
@@ -815,13 +827,15 @@ facilitiesArgGroup.add_argument(
     "--facilities-userfiles-storage-mode",
     dest="mas_ws_facilities_storage_userfiles_mode",
     required=False,
-    help="Storage mode for Facilities user files"
+    help="Storage mode for Facilities user files",
+    default="ReadWriteMany",
 )
 facilitiesArgGroup.add_argument(
     "--facilities-userfiles-storage-size",
     dest="mas_ws_facilities_storage_userfiles_size",
     required=False,
-    help="Storage size for Facilities user files"
+    help="Storage size for Facilities user files",
+    default=50
 )
 
 # Open Data Hub

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/catalogs.py

@@ -9,21 +9,21 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-260430-amd64",
         "v9-260326-amd64",
         "v9-260226-amd64",
         "v9-260216-amd64",
-        "v9-260129-amd64",
     ],
     "s390x": [
+        "v9-260430-s390x",
         "v9-260326-s390x",
         "v9-260226-s390x",
         "v9-260216-s390x",
-        "v9-260129-s390x",
     ],
     "ppc64le": [
+        "v9-260430-ppc64le",
         "v9-260326-ppc64le",
         "v9-260226-ppc64le",
         "v9-260216-ppc64le",
-        "v9-260129-ppc64le",
     ],
 }

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/params.py

@@ -38,6 +38,7 @@ optionalParams = [
     "mas_superuser_password",
     "mas_trust_default_cas",
     "mas_routing_mode",
+    "mas_use_service_mesh",
     "mas_ingress_controller_name",
     "mas_app_settings_server_bundles_size",
     "mas_app_settings_default_jms",

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/settings/manageSettings.py

@@ -15,6 +15,7 @@ from mas.devops.aiservice import listAiServiceTenantInstances, listAiServiceInst
 from openshift.dynamic.exceptions import ResourceNotFoundError
 from ...validators import AiserviceTeanantIDValidator
 from prompt_toolkit import print_formatted_text, HTML
+from mas.devops.utils import isVersionEqualOrAfter
 
 import logging
 logger = logging.getLogger(__name__)
@@ -176,8 +177,12 @@ class ManageSettingsMixin():
                     self.params["mas_appws_components"] += ",aip=latest"
                 if self.yesOrNo(" - Vegetation Management"):
                     self.params["mas_appws_components"] += ",vegm=latest"
+                # Collaborate is only available in Manage 9.2 or higher
+                manageChannel = self.getParam("mas_app_channel_manage")
+                if manageChannel and isVersionEqualOrAfter('9.2.0', manageChannel):
+                    if self.yesOrNo(" - Collaborate"):
+                        self.params["mas_appws_components"] += ",collaborate=latest"
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
-
                 if ",icd=" in self.params["mas_appws_components"]:
                     self.printH2("Maximo IT License Terms")
                     self.printDescription([

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/install/summarizer.py

@@ -81,6 +81,9 @@ class InstallSummarizerMixin():
             self.printParamSummary("IngressController Name", "mas_ingress_controller_name")
             self.printParamSummary("Configure IngressController", "mas_configure_ingress")
 
+        print()
+        self.printParamSummary("Use Service Mesh", "mas_use_service_mesh")
+
         print()
         self.printParamSummary("Configure Suite to run in IPV6", "enable_ipv6")
 

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/mirror/app.py

@@ -35,6 +35,9 @@ from .config import PACKAGE_CONFIGS
 
 logger = logging.getLogger(__name__)
 
+# Constants
+EMPTY_PROGRESS_BAR = " |" + " " * 20 + "|"
+
 
 def logMethodCall(func):
     def wrapper(self, *args, **kwargs):
@@ -485,9 +488,8 @@ def mirrorPackage(package: str, version: str, arch: str, mode: str,
     if not flag:
         logger.info(f"Skipping {package} version {version} for {arch} architecture")
         # Add empty progress bar to align with other status messages
-        emptyBar = " |" + " " * 20 + "|"
         displayName = f"{package} v{version} ({arch})"
-        print(f"{displayName}".ljust(50) + f" ⏭️ {emptyBar} Mirroring disabled by user")
+        print(f"{displayName.ljust(50)} ⏭️ {EMPTY_PROGRESS_BAR} Mirroring disabled by user")
         return MirrorResult(images=0, mirrored=0, name=displayName)
 
     logger.info(f"Mirroring {package} version {version} for {arch} architecture")
@@ -804,10 +806,24 @@ class MirrorApp(BaseApp):
                 "mas_visualinspection_version"
             ]
             if catalogKey in perReleaseVersions:
+                # Check if the catalogKey exists in the catalog first
+                if catalogKey not in catalog or release not in catalog[catalogKey] or (release == "8.10.x" and packageName == "ibm-mas-manage-icd"):
+                    logger.info(f"No content available for {packageName} in MAS release {release}")
+                    displayName = f"{packageName} ({arch})"
+                    print(f"{displayName.ljust(50)} ⏭️ {EMPTY_PROGRESS_BAR} No content to mirror for MAS release {release}")
+                    continue
+
                 version = catalog[catalogKey][release]
             else:
                 version = catalog[catalogKey]
 
+            # Check if version is empty or None (content exists in catalog but is empty)
+            if not version:
+                logger.info(f"No content available for {packageName} in MAS release {release}")
+                displayName = f"{packageName} ({arch})"
+                print(f"{displayName.ljust(50)} ⏭️ {EMPTY_PROGRESS_BAR} No content to mirror for MAS release {release}")
+                continue
+
             if self._isUnsupportedPackage(version, packageName):
                 continue
 

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/mirror/argParser.py

@@ -75,7 +75,7 @@ mainGroup.add_argument(
     "--release",
     required=True,
     help="MAS release version",
-    choices=["8.10.x", "8.11.x", "9.0.x", "9.1.x"]
+    choices=["8.10.x", "8.11.x", "9.0.x", "9.1.x", "9.2.x-feature"]
 )
 mainGroup.add_argument(
     "--mode",

{mas_cli-20.1.0 → mas_cli-20.2.0}/src/mas/cli/mirror/config.py

@@ -26,6 +26,7 @@ PACKAGE_CONFIGS = [
 
     ("Maximo Application Suite", "core", "ibm-mas", "mas_core_version"),
     ("Maximo Application Suite", "assist", "ibm-mas-assist", "mas_assist_version"),
+    ("Maximo Application Suite", "assist", "ibm-couchdb", "couchdb_version"),
     ("Maximo Application Suite", "iot", "ibm-mas-iot", "mas_iot_version"),
     ("Maximo Application Suite", "facilities", "ibm-mas-facilities", "mas_facilities_version"),
     ("Maximo Application Suite", "manage", "ibm-mas-manage", "mas_manage_version"),

mas_cli-20.2.0/src/mas/cli/setup_rbac/__init__.py

@@ -0,0 +1,9 @@
+# *****************************************************************************
+# Copyright (c) 2026 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
+#
+# *****************************************************************************

mas_cli-20.2.0/src/mas/cli/setup_rbac/app.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# *****************************************************************************
+# Copyright (c) 2026 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 logging
+from halo import Halo
+
+from ..cli import BaseApp
+from .argParser import setupRBACArgParser
+from mas.devops.tekton import prepareInstallRBAC
+
+logger = logging.getLogger(__name__)
+
+
+class SetupRBACApp(BaseApp):
+    def setupRBAC(self, argv):
+        """
+        Create the minimal install RBAC resources for MAS installation.
+        This is intended to be used in cases where the user does not have permissions to create RBAC resources in the cluster.
+        The cluster admin create the necessary RBAC resources for them before they run the install command.
+        """
+        self.args = setupRBACArgParser.parse_args(args=argv)
+        self.noConfirm = self.args.no_confirm
+
+        self.printH1("Set Target OpenShift Cluster")
+        self.connect()
+
+        instanceId = self.args.mas_instance_id
+        installUserSA = f"mas-{instanceId}-install-user"
+        installPipelineSA = f"mas-{instanceId}-install-pipeline"
+        pipelineNamespace = f"mas-{instanceId}-pipelines"
+
+        self.printH1("Create RBAC resources for MAS installation")
+        self.printDescription(["This will apply the minimal install RBAC bundle for the target MAS instance."
+                               "",
+                               "The bundle creates the fine-grained service accounts used to run 'mas install' and the install pipeline."])
+        self.printSummary("Instance ID", instanceId)
+        self.printSummary("Install Pipeline Namespace", pipelineNamespace)
+        self.printSummary("Install User Service Account", installUserSA)
+        self.printSummary("Install Pipeline Service Account", installPipelineSA)
+
+        with Halo(text=f"Applying RBAC resources for {instanceId}...", spinner=self.spinner) as h:
+            prepareInstallRBAC(
+                dynClient=self.dynamicClient,
+                namespace=pipelineNamespace,
+                instanceId=instanceId,
+                installRBACDir=self.installRBACDir
+            )
+            h.stop_and_persist(symbol=self.successIcon, text=f"Install RBAC is ready for {instanceId}")
+
+        self.printH1("Next Steps")
+        self.printDescription(["The RBAC resources for the install pipeline have been created. "
+                               "Use the service accounts created by this command to run MAS install without relying on cluster-admin permissions."])
+        self.printHighlight([
+            f"1. Log in using the '{installUserSA}' service account token",
+            f"2. Run 'mas install' with the '--service-account {installPipelineSA}' flag to use the '{installPipelineSA}' service account for the install pipeline"
+        ])

mas_cli-20.2.0/src/mas/cli/setup_rbac/argParser.py

@@ -0,0 +1,57 @@
+# *****************************************************************************
+# Copyright (c) 2026 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
+
+setupRBACArgParser = argparse.ArgumentParser(
+    prog="mas setup-rbac",
+    description="\n".join([
+        f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
+        "Create the minimal install RBAC resources for MAS installation.",
+    ]),
+    epilog="Refer to the online documentation for more details: https://ibm-mas.github.io/cli/examples/minimal-rbac/",
+    formatter_class=getHelpFormatter(),
+    add_help=False
+)
+
+targetArgGroup = setupRBACArgParser.add_argument_group(
+    "Target Cluster Arguments",
+    "Specify the target cluster for which to set up the RBAC resources."
+)
+
+targetArgGroup.add_argument(
+    "-i", "--mas-instance-id",
+    dest="mas_instance_id",
+    required=True,
+    help="The MAS Instance ID to prepare RBAC for"
+)
+
+otherArgGroup = setupRBACArgParser.add_argument_group(
+    "More",
+    "Additional options for setup-rbac."
+)
+
+otherArgGroup.add_argument(
+    "--no-confirm",
+    required=False,
+    action="store_true",
+    default=False,
+    help="Proceed without prompting for cluster confirmation"
+)
+
+setupRBACArgParser.add_argument(
+    "-h", "--help",
+    action="help",
+    default=False,
+    help="Show this help message and exit"
+)