Add sosreport tools e2e test

.github/workflows/e2e.yml

@@ -19,6 +19,11 @@ jobs:
     name: E2E Test Suite
     runs-on: ubuntu-24.04
     timeout-minutes: 20
+    strategy:
+      matrix:
+        include:
+          - {mode: "live-cluster"}
+          - {mode: "offline"}
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
@@ -40,7 +45,7 @@ jobs:
             sudo apt-get install -y pipx
             pipx install jinjanator
             pipx ensurepath
-            echo "$HOME/.local/bin" >> $GITHUB_PATH
+            echo "$HOME/.local/bin" >> "$GITHUB_PATH"
           else
             echo "jinjanator already installed"
           fi
@@ -55,13 +60,19 @@ jobs:
         run: make build
 
       - name: Deploy KIND
+        if: matrix.mode == 'live-cluster'
         run: make deploy-kind-ovnk
 
       - name: Run E2E tests
-        run: make run-e2e
+        run: |
+          if [ "${{ matrix.mode }}" == "live-cluster" ]; then
+            make run-e2e MCP_MODE="live-cluster"
+          else
+            make run-e2e MCP_MODE="offline"
+          fi
 
       - name: Export kind logs
-        if: always()
+        if: always() && matrix.mode == 'live-cluster'
         run: |
           set -x
           # Only export logs if kind CLI exists and cluster is running
@@ -73,15 +84,15 @@ jobs:
           fi
 
       - name: Upload kind logs
-        if: always()
+        if: always() && matrix.mode == 'live-cluster'
         uses: actions/upload-artifact@v4
         with:
-          name: kind-logs-e2e-${{ github.run_id }}
+          name: kind-logs-e2e-${{ matrix.mode }}-${{ github.run_id }}
           path: /tmp/kind/logs
           if-no-files-found: ignore
 
       - name: Cleanup KIND cluster
-        if: always()
+        if: always() && matrix.mode == 'live-cluster'
         run: |
           set -x
           kind delete cluster --name ovn || true

Makefile

@@ -42,15 +42,17 @@ undeploy-kind-ovnk:
 NVM_VERSION := 0.40.3
 NODE_VERSION := 22.20.0
 NPM_VERSION := 11.6.1
+MCP_MODE ?= live-cluster
 
 .PHONY: run-e2e
 run-e2e:
-	./hack/run-e2e.sh $(NVM_VERSION) $(NODE_VERSION) $(NPM_VERSION)
+	./hack/run-e2e.sh $(NVM_VERSION) $(NODE_VERSION) $(NPM_VERSION) "$(MCP_MODE)"
 
 .PHONY: test-e2e
-test-e2e: build deploy-kind-ovnk
+test-e2e: build
+	if [ "$(MCP_MODE)" = "live-cluster" ]; then $(MAKE) deploy-kind-ovnk || exit 1; fi; \
 	$(MAKE) run-e2e || EXIT_CODE=$$?; \
-	$(MAKE) undeploy-kind-ovnk; \
+	if [ "$(MCP_MODE)" = "live-cluster" ]; then $(MAKE) undeploy-kind-ovnk || exit 1; fi; \
 	exit $${EXIT_CODE:-0}
 
 .PHONY: lint

hack/run-e2e.sh

@@ -5,12 +5,18 @@
 NVM_VERSION=$1
 NODE_VERSION=$2
 NPM_VERSION=$3
+MCP_MODE=$4
 
 if [[ -z "${NVM_VERSION}" ]] || [[ -z "${NODE_VERSION}" ]] || [[ -z "${NPM_VERSION}" ]]; then
     echo "NVM_VERSION, NODE_VERSION and NPM_VERSION are required"
     exit 1
 fi
 
+if [[ "${MCP_MODE}" != "offline" && "${MCP_MODE}" != "live-cluster" && -n "${MCP_MODE}" ]]; then
+    echo "Invalid MCP_MODE: ${MCP_MODE}. Must be 'offline' or 'live-cluster'"
+    exit 1
+fi
+
 install_dependencies() {
     # Install ginkgo
     go install github.com/onsi/ginkgo/v2/ginkgo@latest
@@ -40,4 +46,11 @@ echo "Dependencies installed"
 
 # Run e2e tests
 echo "Running e2e tests"
-ginkgo -vv test/e2e
+if [[ "${MCP_MODE}" == "offline" ]]; then
+    echo "Running offline mode tests (sosreport and must-gather)"
+    export MCP_MODE="offline"
+    ginkgo -vv --focus="\[offline\]" test/e2e
+else
+    echo "Running live-cluster mode tests (excluding offline tests)"
+    ginkgo -vv --skip="\[offline\]" test/e2e
+fi

pkg/sosreport/mcp/commands.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+
 	"github.com/ovn-kubernetes/ovn-kubernetes-mcp/pkg/sosreport/types"
 )
 
@@ -122,7 +123,9 @@ func searchCommands(sosreportPath, pattern string, maxResults int) (types.Search
 		return types.SearchCommandsResult{}, fmt.Errorf("invalid search pattern: %w", err)
 	}
 
-	var result types.SearchCommandsResult
+	result := types.SearchCommandsResult{
+		Matches: []types.CommandMatch{},
+	}
 	if maxResults <= 0 {
 		maxResults = defaultResultLimit
 	}

test/e2e/e2e_suite_test.go

@@ -37,6 +37,8 @@ import (
 const (
 	mcpServerPathEnvVar = "MCP_SERVER_PATH"
 	kubeconfigEnvVar    = "KUBECONFIG"
+	mcpModeEnvVar       = "MCP_MODE"
+	mcpModeOffline      = "offline"
 )
 
 var (
@@ -90,6 +92,19 @@ func TestE2e(t *testing.T) {
 var _ = BeforeSuite(func() {
 	mcpServerPath := os.Getenv(mcpServerPathEnvVar)
 	Expect(mcpServerPath).NotTo(BeEmpty())
+
+	mcpMode := os.Getenv(mcpModeEnvVar)
+	Expect(mcpMode).NotTo(BeEmpty())
+	if mcpMode == mcpModeOffline {
+		// Offline mode - configure MCP inspector without kubeconfig
+		mcpInspector = inspector.NewMCPInspector().
+			Command(mcpServerPath).
+			CommandFlags(map[string]string{
+				"mode": "offline",
+			})
+		return
+	}
+
 	kubeconfig := os.Getenv(kubeconfigEnvVar)
 	Expect(kubeconfig).NotTo(BeEmpty())