feat: Merge KMCP crd and controller into Kagent #939

jmhbh · 2025-09-23T21:50:47Z

This PR contains the following changes and is the first in two PRs to migrate KMCP into Kagent. The second PR will focus on migrating the KMCP cli functionalities into the Kagent CLI.

Added KMCP's mcpServer CRD to Kagent.
Added a new controller that watches for the mcpServer CRD and handles the deployment lifecycle of the mcp server deployment.
Refactored existing mcp server controller into mcp_server_tool_controller to better reflect its responsibilities of managing tool discovery.
Added new e2e test for a declarative agent using tools derived from a mcp server deployed using the mcpServer CRD.

Manual Testing:

Interacted with agent using tools derived from the deployed mcp server.
Tested deleting mcp tool server in the UI. (This is the only portion of the UI that was using kmcp resources)

- added mcp server crd - added mcp server controller to manage mcp server deployment lifecycle - added transport adapter layer to support stdio -> http transport conversion - refactored existing mcp_server_controller iinto mcp_server_tool_controller to manage tool discovery for mcp server tools Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

… helm chart Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

- add e2e test using agent with tool from mcp server deployed using mcpServer CRD - fix issue with mcpServer deployment status not being updated after deployment becomes ready Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

jmhbh · 2025-09-23T21:58:21Z

go/internal/controller/mcp_server_tool_controller.go

+
+// +kubebuilder:rbac:groups=kagent.dev,resources=mcpservers,verbs=get;list;watch
+
+func (r *MCPServerToolController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {


This was the original mcp server controller that was implemented as a part of the kmcp integration. I renamed it to mcp_server_tool_controller to better represent its responsibility of updating the tool server.

Why do we need 2 controllers? Now we can re-use since all of the logic is internal

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

Copilot

Pull Request Overview

This PR migrates KMCP CRD and controller functionality into Kagent, removing the external KMCP dependency. It adds a new MCPServer CRD to Kagent with deployment lifecycle management capabilities and refactors existing MCP server handling to separate tool discovery from deployment concerns.

Adds MCPServer CRD to Kagent with comprehensive status conditions and deployment configuration
Introduces MCPServerController for deployment lifecycle management and MCPServerToolController for tool discovery
Removes KMCP dependency and migrates transport adapter functionality into Kagent

Reviewed Changes

Copilot reviewed 26 out of 29 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
go/api/v1alpha1/mcpserver_types.go	Defines new MCPServer CRD with transport types, status conditions, and deployment specifications
go/internal/controller/mcp_server_controller.go	Implements MCPServer deployment lifecycle controller with RBAC permissions
go/internal/controller/mcp_server_tool_controller.go	Handles tool discovery functionality for MCPServer resources
go/internal/controller/translator/translator_adapter.go	Provides transport adapter translation logic for MCPServer to Kubernetes resources
go/internal/controller/reconciler/reconciler.go	Adds MCPServer deployment reconciliation method
go/test/e2e/manifests/*.yaml	Test manifests for declarative agent using MCPServer tools

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

go/internal/controller/translator/translator_adapter.go

go/internal/controller/translator/mcp/translator_adapter.go

helm/kagent-crds/templates/kagent.dev_agents.yaml

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

EItanya

Overall looking great. The main themes of my review are to clean up the controllers and translation. For future work I would like us to try and unify our approach for mcp server outputs and agent outputs.

go/api/v1alpha1/mcpserver_types.go

EItanya · 2025-09-24T21:02:07Z

go/internal/controller/mcp_server_tool_controller.go

+
+// +kubebuilder:rbac:groups=kagent.dev,resources=mcpservers,verbs=get;list;watch
+
+func (r *MCPServerToolController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {


Why do we need 2 controllers? Now we can re-use since all of the logic is internal

go/internal/controller/mcp_server_controller.go

go/internal/controller/translator/mcp/translator_adapter.go

go/internal/controller/translator/labels/constants.go

go/test/e2e/invoke_api_test.go

Makefile

.github/workflows/ci.yaml

- partition agent and mcp translator into respective directories in the translator dir - use mock server in e2e test - reverted CI changes Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

This PR contains the following changes and is the first in two PRs to migrate KMCP into Kagent. The second PR will focus on migrating the KMCP cli functionalities into the Kagent CLI. - Added KMCP's `mcpServer` CRD to Kagent. - Added a new controller that watches for the `mcpServer` CRD and handles the deployment lifecycle of the mcp server deployment. - Refactored existing mcp server controller into `mcp_server_tool_controller` to better reflect its responsibilities of managing tool discovery. - Added new e2e test for a declarative agent using tools derived from a mcp server deployed using the `mcpServer` CRD. Manual Testing: - Interacted with agent using tools derived from the deployed mcp server. - Tested deleting mcp tool server in the UI. (This is the only portion of the UI that was using kmcp resources) --------- Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

jmhbh added 5 commits September 22, 2025 22:25

feat: kmcp migration phase 2 - remove kmcp dependency from go.mod and…

518e0a6

… helm chart Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

fix: extra character in docker tmpl file

0fd6dd0

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

feat: kmcp migration phase 3

b6c3f46

- add e2e test using agent with tool from mcp server deployed using mcpServer CRD - fix issue with mcpServer deployment status not being updated after deployment becomes ready Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

fix: cleanup

2a70338

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

jmhbh commented Sep 23, 2025

View reviewed changes

jmhbh changed the title ~~Merge KMCP into Kagent~~ feat: Merge KMCP into Kagent Sep 23, 2025

jmhbh changed the title ~~feat: Merge KMCP into Kagent~~ feat: Merge KMCP as an optional component into Kagent Sep 23, 2025

jmhbh changed the title ~~feat: Merge KMCP as an optional component into Kagent~~ feat: Merge KMCP into Kagent Sep 23, 2025

fix: use v1alpha1 apiversion to avoid breaking change

6433423

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

jmhbh force-pushed the feat/merge-kmcp branch from b374258 to 6433423 Compare September 23, 2025 22:54

jmhbh changed the title ~~feat: Merge KMCP into Kagent~~ feat: Merge KMCP crd and controller into Kagent Sep 23, 2025

style: cleanup

26795ee

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

jmhbh marked this pull request as ready for review September 23, 2025 23:20

jmhbh requested a review from EItanya as a code owner September 23, 2025 23:20

Copilot AI review requested due to automatic review settings September 23, 2025 23:20

jmhbh requested review from ilackarms, peterj and yuval-k as code owners September 23, 2025 23:20

Copilot AI reviewed Sep 23, 2025

View reviewed changes

go/internal/controller/translator/translator_adapter.go Outdated Show resolved Hide resolved

go/internal/controller/translator/mcp/translator_adapter.go Show resolved Hide resolved

helm/kagent-crds/templates/kagent.dev_agents.yaml Show resolved Hide resolved

jmhbh added 3 commits September 23, 2025 19:26

Merge branch 'main' into feat/merge-kmcp

db90eba

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

style: cleanup

e6bbb31

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

fix: use a2aclient in e2e test

c5611b4

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

EItanya requested changes Sep 24, 2025

View reviewed changes

EItanya reviewed Sep 25, 2025

View reviewed changes

.github/workflows/ci.yaml Outdated Show resolved Hide resolved

refactor: address pr feedback

ed296b7

- partition agent and mcp translator into respective directories in the translator dir - use mock server in e2e test - reverted CI changes Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

jmhbh force-pushed the feat/merge-kmcp branch from 1c37c95 to ed296b7 Compare September 25, 2025 18:29

jmhbh added 3 commits September 25, 2025 14:41

refactor: added back previously deleted functionality

30826f5

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

refactor: undo previous change to controller/main.go

d96a79a

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

fix: add mcp app protocol to mcp service

d90bfec

Signed-off-by: JM Huibonhoa <jm.huibonhoa@solo.io>

EItanya approved these changes Sep 25, 2025

View reviewed changes

EItanya merged commit c605477 into kagent-dev:main Sep 25, 2025
16 checks passed

onematchfox mentioned this pull request Sep 29, 2025

Decouple KMCP integration #822

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Merge KMCP crd and controller into Kagent #939

feat: Merge KMCP crd and controller into Kagent #939

Uh oh!

jmhbh commented Sep 23, 2025 •

edited

Loading

Uh oh!

jmhbh Sep 23, 2025

Uh oh!

EItanya Sep 24, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EItanya left a comment

Uh oh!

Uh oh!

EItanya Sep 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		// +kubebuilder:rbac:groups=kagent.dev,resources=mcpservers,verbs=get;list;watch

		func (r *MCPServerToolController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

feat: Merge KMCP crd and controller into Kagent #939

feat: Merge KMCP crd and controller into Kagent #939

Uh oh!

Conversation

jmhbh commented Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jmhbh Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

EItanya Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EItanya left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

EItanya Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jmhbh commented Sep 23, 2025 •

edited

Loading