Allow setting environment for the proxy server through the operator (#983)

Author: jhrozek

cmd/thv-operator/api/v1alpha1/mcpserver_types.go

@@ -76,13 +76,24 @@ type MCPServerSpec struct {
 type ResourceOverrides struct {
 	// ProxyDeployment defines overrides for the Proxy Deployment resource (toolhive proxy)
 	// +optional
-	ProxyDeployment *ResourceMetadataOverrides `json:"proxyDeployment,omitempty"`
+	ProxyDeployment *ProxyDeploymentOverrides `json:"proxyDeployment,omitempty"`
 
 	// ProxyService defines overrides for the Proxy Service resource (points to the proxy deployment)
 	// +optional
 	ProxyService *ResourceMetadataOverrides `json:"proxyService,omitempty"`
 }
 
+// ProxyDeploymentOverrides defines overrides specific to the proxy deployment
+type ProxyDeploymentOverrides struct {
+	// ResourceMetadataOverrides is embedded to inherit annotations and labels fields
+	ResourceMetadataOverrides `json:",inline"` // nolint:revive
+
+	// Env are environment variables to set in the proxy container (thv run process)
+	// These affect the toolhive proxy itself, not the MCP server it manages
+	// +optional
+	Env []EnvVar `json:"env,omitempty"`
+}
+
 // ResourceMetadataOverrides defines metadata overrides for a resource
 type ResourceMetadataOverrides struct {
 	// Annotations to add or override on the resource

cmd/thv-operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -452,6 +452,16 @@ func (r *MCPServerReconciler) deploymentForMCPServer(m *mcpv1alpha1.MCPServer) *
 	// Prepare container env vars for the proxy container
 	env := []corev1.EnvVar{}
 
+	// Add user-specified proxy environment variables from ResourceOverrides
+	if m.Spec.ResourceOverrides != nil && m.Spec.ResourceOverrides.ProxyDeployment != nil {
+		for _, envVar := range m.Spec.ResourceOverrides.ProxyDeployment.Env {
+			env = append(env, corev1.EnvVar{
+				Name:  envVar.Name,
+				Value: envVar.Value,
+			})
+		}
+	}
+
 	// Prepare container volume mounts
 	volumeMounts := []corev1.VolumeMount{}
 	volumes := []corev1.Volume{}
@@ -837,6 +847,20 @@ func deploymentNeedsUpdate(deployment *appsv1.Deployment, mcpServer *mcpv1alpha1
 			}
 		}
 
+		// Check if the proxy environment variables have changed
+		expectedProxyEnv := []corev1.EnvVar{}
+		if mcpServer.Spec.ResourceOverrides != nil && mcpServer.Spec.ResourceOverrides.ProxyDeployment != nil {
+			for _, envVar := range mcpServer.Spec.ResourceOverrides.ProxyDeployment.Env {
+				expectedProxyEnv = append(expectedProxyEnv, corev1.EnvVar{
+					Name:  envVar.Name,
+					Value: envVar.Value,
+				})
+			}
+		}
+		if !reflect.DeepEqual(container.Env, expectedProxyEnv) {
+			return true
+		}
+
 		// Check if the pod template spec has changed (including secrets)
 		expectedPodTemplateSpec := generateAndMergePodTemplateSpecs(mcpServer.Spec.Secrets, mcpServer.Spec.PodTemplateSpec)