fix: remove the MustGatherContext and InsightsOperatorContext

These two contexts are actually used by CCX rules and redefined in CCX Core too. They are not used in case of non-CCX scenario. Leaving them here would cause archive context identification error, see RHINENG-15103. After this the CCX Core will be the only entry for analyzing must-gather and insights operator archive. Signed-off-by: Xiangce Liu <[email protected]>
RedHatInsights · Jan 10, 2025 · 4cc2d5a · 4cc2d5a
1 parent 340d7a6
commit 4cc2d5a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 228 deletions.
diff --git a/docs/api.rst b/docs/api.rst
@@ -47,18 +47,6 @@ These features allow these archives to be processed quickly and more
 securely in the Insights production environment.  On the other hand, the
 reduced data set narrows the scope of uses to be Insights-specific.
 
-OCP 4 Archives
---------------
-
-OCP 4 can generate diagnostic archives with a component called the
-``insights-operator``.  They are automatically uploaded to Red Hat for analysis.
-
-The openshift-must-gather CLI tool produces more comprehensive archives than
-the operator. ``insights-core`` recognizes them as well.
-
-.. _openshift-must-gather: https://github.com/openshift/must-gather
-
-
 Execution Model
 ===============
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -16,7 +16,6 @@ Contents:
     combiners_index
     components_index
     custom_datasources_index
-    ocp
     shell
     docs_guidelines
     components

diff --git a/docs/ocp.rst b/docs/ocp.rst
diff --git a/insights/core/context.py b/insights/core/context.py
@@ -85,8 +85,7 @@ def __init__(self, version=DEFAULT_VERSION, release=None):
         self.release = release
 
     def __bool__(self):
-        return all([(self.version != DEFAULT_VERSION),
-                   bool(self.release)])
+        return all([(self.version != DEFAULT_VERSION), bool(self.release)])
 
     __nonzero__ = __bool__
 
@@ -102,9 +101,18 @@ def __init__(self, **kwargs):
         self.loaded = True
         self.cmd = None
         optional_attrs = [
-            "content", "path", "hostname", "release",
-            "machine_id", "target", "last_client_run", "relative_path",
-            "args", "engine", "image", "container_id"
+            "content",
+            "path",
+            "hostname",
+            "release",
+            "machine_id",
+            "target",
+            "last_client_run",
+            "relative_path",
+            "args",
+            "engine",
+            "image",
+            "container_id",
         ]
         for k in optional_attrs:
             setattr(self, k, kwargs.pop(k, None))
@@ -168,7 +176,7 @@ def handles(cls, files):
             if m in f:
                 i = f.find(m)
                 if f.endswith(m) or f[i + len(m)] == sep:
-                    root = os.path.dirname(f[:i + 1])
+                    root = os.path.dirname(f[: i + 1])
                     marker_root.add(root)
         if len(marker_root) == 1:
             return (marker_root.pop(), cls)
@@ -182,11 +190,13 @@ def handles(cls, files):
         return (None, None)
 
     def check_output(self, cmd, timeout=None, keep_rc=False, env=None, signum=None):
-        """ Subclasses can override to provide special
-            environment setup, command prefixes, etc.
         """
-        return subproc.call(cmd, timeout=timeout or self.timeout, signum=signum,
-                keep_rc=keep_rc, env=env)
+        Subclasses can override to provide special
+        environment setup, command prefixes, etc.
+        """
+        return subproc.call(
+            cmd, timeout=timeout or self.timeout, signum=signum, keep_rc=keep_rc, env=env
+        )
 
     def shell_out(self, cmd, split=True, timeout=None, keep_rc=False, env=None, signum=None):
         env = env or os.environ
@@ -265,18 +275,6 @@ def locate_path(self, path):
         return super(JDRContext, self).locate_path(p)
 
 
-@fs_root
-class InsightsOperatorContext(ExecutionContext):
-    """Recognizes insights-operator archives"""
-    marker = "config/featuregate"
-
-
-@fs_root
-class MustGatherContext(ExecutionContext):
-    """Recognizes must-gather archives"""
-    marker = "cluster-scoped-resources"
-
-
 class OpenStackContext(ExecutionContext):
     def __init__(self, hostname):
         super(OpenStackContext, self).__init__()

diff --git a/insights/ocp.py b/insights/ocp.py
diff --git a/insights/ocpshell.py b/insights/ocpshell.py
diff --git a/setup.py b/setup.py
@@ -18,7 +18,6 @@
         'insights-dupkeycheck = insights.tools.dupkeycheck:main',
         'insights-inspect = insights.tools.insights_inspect:main',
         'insights-info = insights.tools.query:main',
-        'insights-ocpshell= insights.ocpshell:main',
         'mangle = insights.util.mangle:main',
     ]
 }