Skip to content

Fix incorrect cilium-dbg subcommands #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimetron merged 2 commits into from
Apr 1, 2026
+515 −13
Merged

Fix incorrect cilium-dbg subcommands #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f854196
Fix incorrect cilium-dbg subcommands
dimetron Apr 1, 2026
e69b88a
Bump outdated tools:
dimetron Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ DOCKER_BUILDER ?= docker buildx
DOCKER_BUILD_ARGS ?= --pull --load --platform linux/$(LOCALARCH) --builder $(BUILDX_BUILDER_NAME)

# tools image build args
TOOLS_ISTIO_VERSION ?= 1.28.5
TOOLS_ARGO_ROLLOUTS_VERSION ?= 1.8.4
TOOLS_ISTIO_VERSION ?= 1.29.1
TOOLS_ARGO_ROLLOUTS_VERSION ?= 1.9.0
TOOLS_KUBECTL_VERSION ?= 1.35.3
TOOLS_HELM_VERSION ?= 4.1.3
TOOLS_CILIUM_VERSION ?= 0.19.2
Expand Down
24 changes: 13 additions & 11 deletions pkg/cilium/cilium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cilium
import (
"context"
"fmt"
"strings"

"github.com/kagent-dev/tools/internal/commands"
"github.com/kagent-dev/tools/internal/telemetry"
Expand Down Expand Up @@ -619,7 +620,8 @@ func runCiliumDbgCommandWithContext(ctx context.Context, command, nodeName strin
if err != nil {
return "", err
}
args := []string{"exec", "-it", podName, "--", "cilium-dbg", command}
args := []string{"exec", "-n", "kube-system", podName, "--", "cilium-dbg"}
args = append(args, strings.Fields(command)...)
kubeconfigPath := utils.GetKubeconfig()
return commands.NewCommandBuilder("kubectl").
WithArgs(args...).
Expand Down Expand Up @@ -780,13 +782,13 @@ func handleShowConfigurationOptions(ctx context.Context, request mcp.CallToolReq

var cmd string
if listAll {
cmd = "endpoint config --all"
cmd = "config --all"
} else if listReadOnly {
cmd = "endpoint config -r"
cmd = "config -r"
} else if listOptions {
cmd = "endpoint config --list-options"
cmd = "config --list-options"
} else {
cmd = "endpoint config"
cmd = "config"
}

output, err := runCiliumDbgCommand(ctx, cmd, nodeName)
Expand All @@ -810,7 +812,7 @@ func handleToggleConfigurationOption(ctx context.Context, request mcp.CallToolRe
valueStr = "disable"
}

cmd := fmt.Sprintf("endpoint config %s=%s", option, valueStr)
cmd := fmt.Sprintf("config %s=%s", option, valueStr)
output, err := runCiliumDbgCommand(ctx, cmd, nodeName)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to toggle configuration option: %v", err)), nil
Expand Down Expand Up @@ -885,7 +887,7 @@ func handleFQDNCache(ctx context.Context, request mcp.CallToolRequest) (*mcp.Cal
func handleShowDNSNames(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
nodeName := mcp.ParseString(request, "node_name", "")

output, err := runCiliumDbgCommand(ctx, "dns names", nodeName)
output, err := runCiliumDbgCommand(ctx, "fqdn names", nodeName)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to show DNS names: %v", err)), nil
}
Expand Down Expand Up @@ -1000,7 +1002,7 @@ func handleListBPFMapEvents(ctx context.Context, request mcp.CallToolRequest) (*
return mcp.NewToolResultError("map_name parameter is required"), nil
}

cmd := fmt.Sprintf("bpf map events %s", mapName)
cmd := fmt.Sprintf("map events %s", mapName)
output, err := runCiliumDbgCommand(ctx, cmd, nodeName)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to list BPF map events: %v", err)), nil
Expand All @@ -1016,7 +1018,7 @@ func handleGetBPFMap(ctx context.Context, request mcp.CallToolRequest) (*mcp.Cal
return mcp.NewToolResultError("map_name parameter is required"), nil
}

cmd := fmt.Sprintf("bpf map get %s", mapName)
cmd := fmt.Sprintf("map get %s", mapName)
output, err := runCiliumDbgCommand(ctx, cmd, nodeName)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to get BPF map: %v", err)), nil
Expand All @@ -1027,7 +1029,7 @@ func handleGetBPFMap(ctx context.Context, request mcp.CallToolRequest) (*mcp.Cal
func handleListBPFMaps(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
nodeName := mcp.ParseString(request, "node_name", "")

output, err := runCiliumDbgCommand(ctx, "bpf map list", nodeName)
output, err := runCiliumDbgCommand(ctx, "map list", nodeName)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to list BPF maps: %v", err)), nil
}
Expand Down Expand Up @@ -1055,7 +1057,7 @@ func handleListMetrics(ctx context.Context, request mcp.CallToolRequest) (*mcp.C
func handleListClusterNodes(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
nodeName := mcp.ParseString(request, "node_name", "")

output, err := runCiliumDbgCommand(ctx, "nodes list", nodeName)
output, err := runCiliumDbgCommand(ctx, "node list", nodeName)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to list cluster nodes: %v", err)), nil
}
Expand Down
Loading
Loading