Use CRD introspection flag to enable tool calling

Author: onmete

tests/config/operator_install/olsconfig.crd.azure_openai_tool_calling.yaml

@@ -33,10 +33,4 @@ spec:
       - name: bar_filter
         pattern: '\b(?:bar)\b'
         replaceWith: "openshift"
-  mcp_servers:
-    - name: openshift
-      transport: stdio
-      stdio:
-        command: python
-        args:
-          - ./mcp_local/openshift.py
+    introspectionEnabled: true

tests/config/operator_install/olsconfig.crd.openai_tool_calling.yaml

@@ -31,10 +31,4 @@ spec:
       - name: bar_filter
         pattern: '\b(?:bar)\b'
         replaceWith: "openshift"
-  mcp_servers:
-    - name: openshift
-      transport: stdio
-      stdio:
-        command: python
-        args:
-          - ./mcp_local/openshift.py
+    introspectionEnabled: true

tests/config/operator_install/olsconfig.crd.watsonx_tool_calling.yaml

@@ -32,10 +32,4 @@ spec:
       - name: bar_filter
         pattern: '\b(?:bar)\b'
         replaceWith: "openshift"
-  mcp_servers:
-    - name: openshift
-      transport: stdio
-      stdio:
-        command: python
-        args:
-          - ./mcp_local/openshift.py
+    introspectionEnabled: true

tests/e2e/utils/ols_installer.py

@@ -69,7 +69,7 @@ def create_and_config_sas() -> tuple[str, str]:
     return token, metrics_token
 
 
-def update_ols_config(tool_calling_enabled: bool) -> None:
+def update_ols_config() -> None:
     """Create the ols config configmap with log and collector config for e2e tests.
 
     Returns:
@@ -84,20 +84,6 @@ def update_ols_config(tool_calling_enabled: bool) -> None:
     # logs beying redacted/removed completely - we need log at info level
     olsconfig["ols_config"]["logging_config"]["lib_log_level"] = "INFO"
 
-    if tool_calling_enabled:
-        olsconfig["mcp_servers"] = [
-            {
-                "name": "openshift",
-                "transport": "stdio",
-                "stdio": {
-                    "command": "python3.11",
-                    "args": [
-                        "/app-root/mcp_local/openshift.py",
-                    ],
-                },
-            }
-        ]
-
     # add collector config for e2e tests
     olsconfig["user_data_collector_config"] = {
         "data_storage": "/app-root/ols-user-data",
@@ -459,7 +445,7 @@ def install_ols() -> tuple[str, str, str]:  # pylint: disable=R0915, R0912  # no
             "0",
         ]
     )
-    update_ols_config(tool_calling_enabled)
+    update_ols_config()
     # scale the ols app server up
     cluster_utils.run_oc(
         [