Skip to content

Add default resource limits and separate proxy runner resource config #3067

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

Open
4t8dd wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add default resource limits and separate proxy runner resource config #3067

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
48387c9
Add default resource limits and separate proxy runner resource config…
4t8dd Dec 10, 2025
0fa5067
Merge branch 'main' into issue-2873-vmcp-default-resources
4t8dd Dec 16, 2025
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
6 changes: 6 additions & 0 deletions cmd/thv-operator/api/v1alpha1/mcpserver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@ type MCPServerSpec struct {
// +optional
Resources ResourceRequirements `json:"resources,omitempty"`

// ProxyRunnerResources defines the resource requirements for the ToolHive proxy runner container.
// The proxy runner is the infrastructure container that manages the MCP server container.
// If not specified, defaults to 50m/200m CPU and 64Mi/256Mi memory (lighter than MCP server defaults).
// +optional
ProxyRunnerResources ResourceRequirements `json:"proxyRunnerResources,omitempty"`

// Secrets are references to secrets to mount in the MCP server container
// +optional
Secrets []SecretRef `json:"secrets,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions cmd/thv-operator/api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 31 additions & 44 deletions cmd/thv-operator/controllers/mcpserver_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -928,9 +927,13 @@ func (r *MCPServerReconciler) deploymentForMCPServer(
defaultSA := mcpServerServiceAccountName(m.Name)
serviceAccount = &defaultSA
}
// Convert MCP server resources to Kubernetes format
mcpResources := resourceRequirementsForMCPServer(m)

finalPodTemplateSpec := builder.
WithServiceAccount(serviceAccount).
WithSecrets(m.Spec.Secrets).
WithResources(mcpResources).
Build()
// Add pod template patch if we have one
if finalPodTemplateSpec != nil {
Expand Down Expand Up @@ -1062,26 +1065,9 @@ func (r *MCPServerReconciler) deploymentForMCPServer(
volumes = append(volumes, *authzVolume)
}

// Prepare container resources
resources := corev1.ResourceRequirements{}
if m.Spec.Resources.Limits.CPU != "" || m.Spec.Resources.Limits.Memory != "" {
resources.Limits = corev1.ResourceList{}
if m.Spec.Resources.Limits.CPU != "" {
resources.Limits[corev1.ResourceCPU] = resource.MustParse(m.Spec.Resources.Limits.CPU)
}
if m.Spec.Resources.Limits.Memory != "" {
resources.Limits[corev1.ResourceMemory] = resource.MustParse(m.Spec.Resources.Limits.Memory)
}
}
if m.Spec.Resources.Requests.CPU != "" || m.Spec.Resources.Requests.Memory != "" {
resources.Requests = corev1.ResourceList{}
if m.Spec.Resources.Requests.CPU != "" {
resources.Requests[corev1.ResourceCPU] = resource.MustParse(m.Spec.Resources.Requests.CPU)
}
if m.Spec.Resources.Requests.Memory != "" {
resources.Requests[corev1.ResourceMemory] = resource.MustParse(m.Spec.Resources.Requests.Memory)
}
}
// Prepare container resources for the proxy runner container
// Note: This is separate from MCP server container resources (which are in the pod template patch)
resources := resourceRequirementsForProxyRunner(m)

// Prepare deployment metadata with overrides
deploymentLabels := ls
Expand Down Expand Up @@ -1528,9 +1514,13 @@ func (r *MCPServerReconciler) deploymentNeedsUpdate(
return true
}

// Convert MCP server resources to Kubernetes format (same as in deploymentForMCPServer)
mcpResources := resourceRequirementsForMCPServer(mcpServer)

expectedPodTemplateSpec := builder.
WithServiceAccount(serviceAccount).
WithSecrets(mcpServer.Spec.Secrets).
WithResources(mcpResources).
Build()

// Find the current pod template patch in the container args
Expand Down Expand Up @@ -1560,8 +1550,8 @@ func (r *MCPServerReconciler) deploymentNeedsUpdate(
return true
}

// Check if the resource requirements have changed
if !reflect.DeepEqual(container.Resources, resourceRequirementsForMCPServer(mcpServer)) {
// Check if the proxy runner container resource requirements have changed
if !reflect.DeepEqual(container.Resources, resourceRequirementsForProxyRunner(mcpServer)) {
return true
}
}
Expand Down Expand Up @@ -1656,28 +1646,25 @@ func serviceNeedsUpdate(service *corev1.Service, mcpServer *mcpv1alpha1.MCPServe
return false
}

// resourceRequirementsForMCPServer returns the resource requirements for the MCPServer
// resourceRequirementsForMCPServer returns the resource requirements for the MCP server container
// with intelligent merging of defaults and user-provided values
func resourceRequirementsForMCPServer(m *mcpv1alpha1.MCPServer) corev1.ResourceRequirements {
resources := corev1.ResourceRequirements{}
if m.Spec.Resources.Limits.CPU != "" || m.Spec.Resources.Limits.Memory != "" {
resources.Limits = corev1.ResourceList{}
if m.Spec.Resources.Limits.CPU != "" {
resources.Limits[corev1.ResourceCPU] = resource.MustParse(m.Spec.Resources.Limits.CPU)
}
if m.Spec.Resources.Limits.Memory != "" {
resources.Limits[corev1.ResourceMemory] = resource.MustParse(m.Spec.Resources.Limits.Memory)
}
}
if m.Spec.Resources.Requests.CPU != "" || m.Spec.Resources.Requests.Memory != "" {
resources.Requests = corev1.ResourceList{}
if m.Spec.Resources.Requests.CPU != "" {
resources.Requests[corev1.ResourceCPU] = resource.MustParse(m.Spec.Resources.Requests.CPU)
}
if m.Spec.Resources.Requests.Memory != "" {
resources.Requests[corev1.ResourceMemory] = resource.MustParse(m.Spec.Resources.Requests.Memory)
}
}
return resources
defaultResources := ctrlutil.BuildDefaultResourceRequirements()
userResources := ctrlutil.BuildResourceRequirements(m.Spec.Resources)
return ctrlutil.MergeResourceRequirements(defaultResources, userResources)
}

// resourceRequirementsForProxyRunner returns the resource requirements for the proxy runner container
// with intelligent merging of defaults and user-provided values
func resourceRequirementsForProxyRunner(m *mcpv1alpha1.MCPServer) corev1.ResourceRequirements {
// Get default proxy runner resources (lighter than MCP server defaults)
defaultProxyResources := ctrlutil.BuildDefaultProxyRunnerResourceRequirements()

// Get user-defined proxy resources from the dedicated field
userProxyResources := ctrlutil.BuildResourceRequirements(m.Spec.ProxyRunnerResources)

// Merge defaults with user-defined values
return ctrlutil.MergeResourceRequirements(defaultProxyResources, userProxyResources)
}

// mcpServerServiceAccountName returns the service account name for the mcp server
Expand Down
Loading
Loading