mas-cli 21.10.0__tar.gz → 21.10.2__tar.gz

{mas_cli-21.10.0/python/src/mas_cli.egg-info → mas_cli-21.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 21.10.0
+Version: 21.10.2
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/__init__.py

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

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/cli.py

@@ -126,7 +126,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "21.10.0"
+        self.version: str = "21.10.2"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/install/settings/aiSettings.py

@@ -80,7 +80,8 @@ class AiSettingsMixin:
             except (ValueError, IndexError):
                 pass
 
-        # If MAS 9.1 or earlier, force disable AiCfg regardless of user input
+        # Skip AiCfg configuration silently for MAS 9.1 and earlier
+        # Do not display any warnings, messages, or step numbers
         if not is_mas_92_or_later:
             return
 

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/aiservice/instance.py

@@ -174,7 +174,6 @@ def addAIServiceToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str,
                     namespace=instanceNamespace,
                     outputDir=outputDir,
                     noLogs=noLogs,
-                    secretData=False,
                     customResources=None,
                     ibmCRDs=ibmCRDs,
                 )
@@ -206,7 +205,6 @@ def addAIServiceToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str,
                                 namespace=tenantId,
                                 outputDir=outputDir,
                                 noLogs=noLogs,
-                                secretData=False,
                                 customResources=ISVC_RESOURCES,
                                 ibmCRDs=ibmCRDs,
                             )
@@ -241,7 +239,6 @@ def addAIServiceToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str,
                                 namespace=pipelineNamespace,
                                 outputDir=outputDir,
                                 noLogs=noLogs,
-                                secretData=False,
                                 customResources=TEKTON_RESOURCES,
                                 ibmCRDs=ibmCRDs,
                             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/app.py

@@ -14,8 +14,11 @@ import hashlib
 import logging
 import os
 
+from halo import Halo
 import requests
-from mas.cli import BaseApp
+
+from ..cli import BaseApp
+
 from .arg_parser import mustGatherArgParser
 from .output import OutputManager
 from .timer import Timer
@@ -26,7 +29,6 @@ from .aiservice import instance as aiservice_instance
 from .argo import applications as argo
 from .common.task_generation import generateNamespaceCollectionTasks
 from . import web_viewer
-from halo import Halo
 
 logger = logging.getLogger(__name__)
 
@@ -406,12 +408,12 @@ class MustGatherApp(BaseApp):
         else:
             logger.debug("Skipping SLS collection (not in collectors list)")
 
+        masInstanceIds = parsedArgs.mas_instance_ids.split(",") if parsedArgs.mas_instance_ids else None
+        masAppIds = parsedArgs.mas_app_ids.split(",") if parsedArgs.mas_app_ids else None
+
         # MAS Discovery (triggered by 'mas' or 'lic' collector)
         if "mas" in enabledCollectors or "lic" in enabledCollectors:
             try:
-                masInstanceIds = parsedArgs.mas_instance_ids.split(",") if parsedArgs.mas_instance_ids else None
-                masAppIds = parsedArgs.mas_app_ids.split(",") if parsedArgs.mas_app_ids else None
-
                 # Add MAS Core collection tasks
                 coreNamespaces = mas_core.addMASCoreToCollectionPlan(
                     plan=plan,
@@ -436,14 +438,6 @@ class MustGatherApp(BaseApp):
                             masAppIds=masAppIds,
                         )
 
-                        # Add MAS Pipelines collection tasks
-                        mas_pipelines.addMASPipelinesToCollectionPlan(
-                            plan=plan,
-                            dynClient=self.dynamicClient,
-                            outputDir=outputDir,
-                            noLogs=parsedArgs.no_logs,
-                            ibmCRDs=self.ibmCRDsList,
-                        )
                 else:
                     logger.debug("No MAS instances discovered")
             except Exception as e:
@@ -451,6 +445,18 @@ class MustGatherApp(BaseApp):
         else:
             logger.debug("Skipping MAS collection (not in collectors list)")
 
+        # Tekton Pipeline Discovery
+        if "pipelines" in enabledCollectors:
+            mas_pipelines.addMASPipelinesToCollectionPlan(
+                plan=plan,
+                dynClient=self.dynamicClient,
+                outputDir=outputDir,
+                noLogs=parsedArgs.no_logs,
+                masInstanceIds=masInstanceIds,
+            )
+        else:
+            logger.debug("Skipping Tekton Pipeline collection (not in collectors list)")
+
         # AI Service Discovery
         if "aiservice" in enabledCollectors:
             aiservice_instance.addAIServiceToCollectionPlan(
@@ -464,13 +470,16 @@ class MustGatherApp(BaseApp):
             logger.debug("Skipping AI Service collection (not in collectors list)")
 
         # Argo Discovery
-        argo.addArgoToCollectionPlan(
-            plan=plan,
-            dynClient=self.dynamicClient,
-            outputDir=outputDir,
-            noLogs=parsedArgs.no_logs,
-            ibmCRDs=self.ibmCRDsList,
-        )
+        if "argo" in enabledCollectors:
+            argo.addArgoToCollectionPlan(
+                plan=plan,
+                dynClient=self.dynamicClient,
+                outputDir=outputDir,
+                noLogs=parsedArgs.no_logs,
+                ibmCRDs=self.ibmCRDsList,
+            )
+        else:
+            logger.debug("Skipping ArgoCD collection (not in collectors list)")
 
         # Extra Namespaces Discovery
         if parsedArgs.extra_namespaces:
@@ -483,7 +492,6 @@ class MustGatherApp(BaseApp):
                     namespace=namespace,
                     outputDir=outputDir,
                     noLogs=parsedArgs.no_logs,
-                    secretData=False,
                     customResources=None,
                     ibmCRDs=self.ibmCRDsList,
                 )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/arg_parser.py

@@ -72,7 +72,7 @@ def _parse_args_wrapper(args=None, namespace=None):
 
 
 # Define all available collectors
-ALL_COLLECTORS = ["ocp", "db2", "kafka", "mongodb", "cp4d", "cert-manager", "grafana", "sls", "mas", "rhoai", "aiservice", "lic"]
+ALL_COLLECTORS = ["ocp", "db2", "kafka", "mongodb", "cp4d", "cert-manager", "grafana", "sls", "mas", "rhoai", "aiservice", "lic", "pipelines"]
 
 
 def validateCollectors(collectorsStr: str) -> str:
@@ -137,7 +137,6 @@ controlsGroup.add_argument(
     help=f"Comma-separated list of collectors to run (default: all)\nAvailable collectors: {', '.join(ALL_COLLECTORS)}",
 )
 controlsGroup.add_argument("--no-logs", action="store_true", default=False, help="Skip collection of pod logs, greatly speeds up must-gather collection time")
-controlsGroup.add_argument("--secret-data", action="store_true", default=False, help="Include secrets content in the must-gather")
 
 # MAS Content Controls group
 masGroup = mustGatherArgParser.add_argument_group("MAS Content Controls")

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/argo/applications.py

@@ -72,7 +72,6 @@ def addArgoToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, noLo
                 namespace="openshift-gitops",
                 outputDir=outputDir,
                 noLogs=noLogs,
-                secretData=False,
                 customResources=None,
                 ibmCRDs=ibmCRDs,
             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/common/secrets.py

@@ -24,19 +24,16 @@ def collectSecrets(
     coreV1: CoreV1Api,
     namespace: str,
     outputDir: str,
-    secretData: bool = False,
 ) -> tuple[bool, int]:
     """Collect Kubernetes secrets from a namespace.
 
-    Collects secrets and generates both summary and detailed YAML output. When secretData
-    is False, secret data is excluded from YAML. When True, includes full YAML
-    with base64-encoded secret data.
+    Collects secrets and generates both summary and detailed YAML output.
+    Secret data is excluded from YAML.
 
     Args:
         coreV1 (CoreV1Api): Kubernetes CoreV1Api client instance
         namespace (str): Target namespace for collection
         outputDir (str): Base output directory for collected secrets
-        secretData (bool, optional): If True, include secret data in YAML output. If False, exclude secret data. Defaults to False.
 
     Returns:
         tuple[bool, int]: (success status, count of secrets collected)
@@ -70,8 +67,8 @@ def collectSecrets(
                 secretDict["apiVersion"] = "v1"
             if "kind" not in secretDict:
                 secretDict["kind"] = "Secret"
-            # Write YAML (with or without secret data based on secretData flag)
-            _writeYaml(secretDict, secretFile, includeData=secretData)
+            # Write YAML
+            _writeYaml(secretDict, secretFile)
 
         return (True, secretCount)
 
@@ -105,16 +102,15 @@ def _writeSummary(secretListDict: dict, outputFile: str) -> None:
             f.write("No resources found.\n")
 
 
-def _writeYaml(secretDict: dict, outputFile: str, includeData: bool = True) -> None:
+def _writeYaml(secretDict: dict, outputFile: str) -> None:
     """Write secret as YAML file.
 
     Args:
         secretDict (dict): Secret dictionary to write
         outputFile (str): Path to output file
-        includeData (bool, optional): If False, remove secret data before writing. Defaults to True.
     """
-    # Remove secret data if not requested
-    if not includeData and "data" in secretDict:
+    # ALWAYS remove secret data
+    if "data" in secretDict:
         secretDict = secretDict.copy()
         secretDict.pop("data", None)
 

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/common/task_generation.py

@@ -26,7 +26,6 @@ def generateNamespaceCollectionTasks(
     namespace: str,
     outputDir: str,
     noLogs: bool = False,
-    secretData: bool = False,
     customResources: Optional[List[Tuple[str, str]]] = None,
     ibmCRDs: Optional[List[Tuple[str, str]]] = None,
 ) -> List[Tuple]:
@@ -41,7 +40,6 @@ def generateNamespaceCollectionTasks(
         namespace (str): Target namespace for collection
         outputDir (str): Base output directory for collected resources
         noLogs (bool, optional): If True, skip pod log collection. Defaults to False.
-        secretData (bool, optional): If True, include secret data in YAML. Defaults to False.
         customResources (list, optional): Custom CRD tuples (apiVersion, kind) specific to this namespace type. Defaults to None.
         ibmCRDs (list, optional): Additional IBM CRD tuples (apiVersion, kind) to collect. Defaults to None.
 
@@ -87,6 +85,7 @@ def generateNamespaceCollectionTasks(
         ("v1", "ServiceAccount"),
         ("rbac.authorization.k8s.io/v1", "Role"),
         ("rbac.authorization.k8s.io/v1", "RoleBinding"),
+        ("route.openshift.io/v1", "Route"),
         ("networking.k8s.io/v1", "NetworkPolicy"),
         ("networking.k8s.io/v1", "Ingress"),
         ("operators.coreos.com/v1alpha1", "Subscription"),
@@ -118,7 +117,6 @@ def generateNamespaceCollectionTasks(
             coreV1,
             namespace,
             outputDir,
-            secretData,
         )
     )
 

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/cert_manager.py

@@ -83,7 +83,6 @@ def addCertManagerToCollectionPlan(plan, dynClient: DynamicClient, outputDir: st
                 namespace=ns,
                 outputDir=outputDir,
                 noLogs=noLogs,
-                secretData=False,
                 customResources=CERT_MANAGER_RESOURCES,
                 ibmCRDs=ibmCRDs,
             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/cp4d.py

@@ -77,7 +77,6 @@ def _generateCP4DCollectionTasks(
             namespace=namespace,
             outputDir=outputDir,
             noLogs=noLogs,
-            secretData=False,
             customResources=None,  # CP4D doesn't have specific CRDs to collect
             ibmCRDs=ibmCRDs,
         )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/db2.py

@@ -125,7 +125,6 @@ def _generateDb2CollectionTasks(
             namespace=namespace,
             outputDir=outputDir,
             noLogs=noLogs,
-            secretData=False,
             customResources=db2Resources,
             ibmCRDs=ibmCRDs,
         )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/grafana.py

@@ -64,7 +64,6 @@ def addGrafanaToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, n
                 namespace=ns,
                 outputDir=outputDir,
                 noLogs=noLogs,
-                secretData=False,
                 customResources=GRAFANA_RESOURCES,
                 ibmCRDs=ibmCRDs,
             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/kafka.py

@@ -65,7 +65,6 @@ def addKafkaToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, noL
                 namespace=ns,
                 outputDir=outputDir,
                 noLogs=noLogs,
-                secretData=False,
                 customResources=KAFKA_RESOURCES,
                 ibmCRDs=ibmCRDs,
             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/mongodb.py

@@ -63,7 +63,6 @@ def addMongoDBToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, n
                 namespace=ns,
                 outputDir=outputDir,
                 noLogs=noLogs,
-                secretData=False,
                 customResources=MONGODB_RESOURCES,
                 ibmCRDs=ibmCRDs,
             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/rhoai.py

@@ -86,7 +86,6 @@ def _generateRHOAICollectionTasks(
         namespace=namespace,
         outputDir=outputDir,
         noLogs=noLogs,
-        secretData=False,
         customResources=customResources,
         ibmCRDs=ibmCRDs,
     )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/dependencies/sls.py

@@ -67,7 +67,6 @@ def _generateSLSCollectionTasks(
         namespace=namespace,
         outputDir=outputDir,
         noLogs=noLogs,
-        secretData=False,
         customResources=None,  # SLS uses IBM CRDs
         ibmCRDs=ibmCRDs,
     )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/mas/apps.py

@@ -66,7 +66,7 @@ def _discoverMASAppNamespaces(dynClient: DynamicClient, masInstanceId: str, masA
                 appId = nsName[len(namespacePrefix) :]
 
                 # Skip core namespace (handled separately)
-                if appId == "core":
+                if appId in ["core", "pipelines"]:
                     continue
 
                 # If specific app IDs provided, filter by them
@@ -176,7 +176,6 @@ def _generateMASAppCollectionTasks(
         namespace=namespace,
         outputDir=outputDir,
         noLogs=noLogs,
-        secretData=False,
         customResources=None,
         ibmCRDs=ibmCRDs,
     )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/mas/core.py

@@ -243,7 +243,6 @@ def _generateMASCoreCollectionTasks(
                 namespace=namespace,
                 outputDir=outputDir,
                 noLogs=noLogs,
-                secretData=False,  # MAS Core does not include secret data
                 customResources=None,  # No MAS-specific CRDs to add
                 ibmCRDs=ibmCRDs,
             )

{mas_cli-21.10.0 → mas_cli-21.10.2}/python/src/mas/cli/must_gather/mas/pipelines.py

@@ -37,7 +37,7 @@ TEKTON_RESOURCES = [
 ]
 
 
-def _discoverMASPipelineNamespaces(dynClient: DynamicClient, masInstanceIds: Optional[List[str]] = None, includeClusterLevel: bool = False) -> Set[str]:
+def _discoverMASPipelineNamespaces(dynClient: DynamicClient, masInstanceIds: Optional[List[str]] = None) -> Set[str]:
     """Discover MAS pipeline namespaces.
 
     Discovers namespaces matching the pattern mas-{instance}-pipelines for instance-specific
@@ -65,17 +65,12 @@ def _discoverMASPipelineNamespaces(dynClient: DynamicClient, masInstanceIds: Opt
             nsName = ns.metadata.name
 
             # Check for cluster-level mas-pipelines namespace
-            if includeClusterLevel and nsName == "mas-pipelines":
+            if nsName == "mas-pipelines":
                 namespaces.add(nsName)
-                continue
 
             # Check if namespace matches mas-{instance}-pipelines pattern
-            if nsName.startswith("mas-") and nsName.endswith("-pipelines"):
+            elif nsName.startswith("mas-") and nsName.endswith("-pipelines"):
                 # Extract instance ID from namespace name (mas-{instance}-pipelines)
-                # Skip if it's the cluster-level namespace
-                if nsName == "mas-pipelines":
-                    continue
-
                 instanceId = nsName[4:-10]  # Remove "mas-" prefix and "-pipelines" suffix
 
                 # If specific instance IDs provided, filter by them
@@ -92,10 +87,10 @@ def _discoverMASPipelineNamespaces(dynClient: DynamicClient, masInstanceIds: Opt
     return namespaces
 
 
-def addMASPipelinesToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, noLogs: bool, ibmCRDs: list):
+def addMASPipelinesToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, noLogs: bool, masInstanceIds: Optional[List[str]] = None):
     """Add MAS Pipelines collection tasks to the collection plan.
 
-    Discovers cluster-level MAS pipelines namespace and adds collection group
+    Discovers MAS pipelines namespace and adds collection group
     to the provided collection plan.
 
     Args:
@@ -103,25 +98,15 @@ def addMASPipelinesToCollectionPlan(plan, dynClient: DynamicClient, outputDir: s
         dynClient (DynamicClient): Kubernetes Dynamic Client for API access
         outputDir (str): Base output directory for collected resources
         noLogs (bool): If True, skip pod log collection
-        ibmCRDs (list): List of IBM CRD information for collection
     """
-    logger.debug("Discovering cluster-level MAS pipelines")
+    logger.debug("Discovering MAS pipelines namespaces")
     try:
-        clusterPipelineNamespaces = _discoverMASPipelineNamespaces(dynClient, masInstanceIds=[], includeClusterLevel=True)
-        if "mas-pipelines" in clusterPipelineNamespaces:
-            logger.info("Discovered cluster-level MAS pipelines namespace")
+        masPipelineNamespaces = _discoverMASPipelineNamespaces(dynClient, masInstanceIds)
+        for pipelinesNamespace in masPipelineNamespaces:
             tasks = generateNamespaceCollectionTasks(
-                dynClient=dynClient,
-                namespace="mas-pipelines",
-                outputDir=outputDir,
-                noLogs=noLogs,
-                secretData=False,
-                customResources=TEKTON_RESOURCES,
-                ibmCRDs=ibmCRDs,
+                dynClient=dynClient, namespace=pipelinesNamespace, outputDir=outputDir, noLogs=noLogs, customResources=TEKTON_RESOURCES
             )
-            plan.addGroup("MAS Pipelines (cluster)", tasks)
-            logger.debug(f"Added {len(tasks)} MAS Pipelines collection tasks for cluster-level pipelines")
-        else:
-            logger.info("No cluster-level MAS pipelines namespace found")
+            plan.addGroup(f"MAS Pipelines ({pipelinesNamespace})", tasks)
+            logger.debug(f"Added {len(tasks)} MAS Pipelines collection tasks for {pipelinesNamespace}")
     except Exception as e:
         logger.warning(f"MAS Pipelines discovery failed: {e}")