-
Notifications
You must be signed in to change notification settings - Fork 218
Expand file tree
/
Copy pathmcpremoteproxy_deployment.go
More file actions
444 lines (396 loc) · 15.9 KB
/
mcpremoteproxy_deployment.go
File metadata and controls
444 lines (396 loc) · 15.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
// SPDX-FileCopyrightText: Copyright 2025 Stacklok, Inc.
// SPDX-License-Identifier: Apache-2.0
package controllers
import (
"context"
"fmt"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/log"
mcpv1beta1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1beta1"
ctrlutil "github.com/stacklok/toolhive/cmd/thv-operator/pkg/controllerutil"
"github.com/stacklok/toolhive/cmd/thv-operator/pkg/runconfig/configmap/checksum"
"github.com/stacklok/toolhive/pkg/container/kubernetes"
)
// deploymentForMCPRemoteProxy returns a MCPRemoteProxy Deployment object
func (r *MCPRemoteProxyReconciler) deploymentForMCPRemoteProxy(
ctx context.Context, proxy *mcpv1beta1.MCPRemoteProxy, runConfigChecksum string,
) *appsv1.Deployment {
ls := labelsForMCPRemoteProxy(proxy.Name)
replicas := int32(1)
// Build deployment components using helper functions
args := r.buildContainerArgs()
volumeMounts, volumes := r.buildVolumesForProxy(proxy)
r.addTelemetryCABundleVolumes(ctx, proxy, &volumes, &volumeMounts)
env := r.buildEnvVarsForProxy(ctx, proxy)
// Add embedded auth server volumes and env vars. AuthServerRef takes precedence;
// externalAuthConfigRef is used as a fallback (legacy path).
configName := ctrlutil.EmbeddedAuthServerConfigName(proxy.Spec.ExternalAuthConfigRef, proxy.Spec.AuthServerRef)
if configName != "" {
authServerVolumes, authServerMounts, authServerEnvVars, err := ctrlutil.GenerateAuthServerConfigByName(
ctx, r.Client, proxy.Namespace, configName,
)
if err != nil {
log.FromContext(ctx).Error(err, "Failed to generate auth server configuration")
return nil
}
volumes = append(volumes, authServerVolumes...)
volumeMounts = append(volumeMounts, authServerMounts...)
env = append(env, authServerEnvVars...)
}
resources := ctrlutil.BuildResourceRequirements(proxy.Spec.Resources)
deploymentLabels, deploymentAnnotations := r.buildDeploymentMetadata(ls, proxy)
deploymentTemplateLabels, deploymentTemplateAnnotations := r.buildPodTemplateMetadata(ls, proxy, runConfigChecksum)
podSecurityContext, containerSecurityContext := r.buildSecurityContexts(ctx, proxy)
dep := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: proxy.Name,
Namespace: proxy.Namespace,
Labels: deploymentLabels,
Annotations: deploymentAnnotations,
},
Spec: appsv1.DeploymentSpec{
Replicas: &replicas,
Selector: &metav1.LabelSelector{
MatchLabels: ls,
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: deploymentTemplateLabels,
Annotations: deploymentTemplateAnnotations,
},
Spec: corev1.PodSpec{
ServiceAccountName: serviceAccountNameForRemoteProxy(proxy),
ImagePullSecrets: r.imagePullSecretsForRemoteProxy(proxy),
Containers: []corev1.Container{{
Image: getToolhiveRunnerImage(),
Name: "toolhive",
Args: args,
Env: env,
VolumeMounts: volumeMounts,
Resources: resources,
Ports: r.buildContainerPorts(proxy),
LivenessProbe: ctrlutil.BuildHealthProbe("/health", "http", 30, 10, 5, 3),
ReadinessProbe: ctrlutil.BuildHealthProbe("/health", "http", 15, 5, 3, 3),
SecurityContext: containerSecurityContext,
}},
Volumes: volumes,
SecurityContext: podSecurityContext,
},
},
},
}
if err := controllerutil.SetControllerReference(proxy, dep, r.Scheme); err != nil {
ctxLogger := log.FromContext(ctx)
ctxLogger.Error(err, "Failed to set controller reference for Deployment")
return nil
}
return dep
}
// buildContainerArgs builds the container arguments for the proxy
func (*MCPRemoteProxyReconciler) buildContainerArgs() []string {
// The third argument is required by proxyrunner command signature but is ignored
// when RemoteURL is set (HTTPTransport.Setup returns early for remote servers)
return []string{"run", "--foreground=true", "placeholder-for-remote-proxy"}
}
// buildVolumesForProxy builds volumes and volume mounts for the proxy.
// Note: Embedded auth server volumes are added separately in deploymentForMCPRemoteProxy
// to avoid duplicate API calls.
func (*MCPRemoteProxyReconciler) buildVolumesForProxy(
proxy *mcpv1beta1.MCPRemoteProxy,
) ([]corev1.VolumeMount, []corev1.Volume) {
volumeMounts := []corev1.VolumeMount{}
volumes := []corev1.Volume{}
// Add RunConfig ConfigMap volume
configMapName := fmt.Sprintf("%s-runconfig", proxy.Name)
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: "runconfig",
MountPath: "/etc/runconfig",
ReadOnly: true,
})
volumes = append(volumes, corev1.Volume{
Name: "runconfig",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: configMapName,
},
},
},
})
// Add authz config volume if needed
authzVolumeMount, authzVolume := ctrlutil.GenerateAuthzVolumeConfig(proxy.Spec.AuthzConfig, proxy.Name)
if authzVolumeMount != nil {
volumeMounts = append(volumeMounts, *authzVolumeMount)
volumes = append(volumes, *authzVolume)
}
return volumeMounts, volumes
}
// addTelemetryCABundleVolumes appends CA bundle volumes for the referenced MCPTelemetryConfig.
// Must be called from deploymentForMCPRemoteProxy where the client is available.
func (r *MCPRemoteProxyReconciler) addTelemetryCABundleVolumes(
ctx context.Context,
proxy *mcpv1beta1.MCPRemoteProxy,
volumes *[]corev1.Volume,
volumeMounts *[]corev1.VolumeMount,
) {
if proxy.Spec.TelemetryConfigRef == nil {
return
}
telCfg, err := ctrlutil.GetTelemetryConfigForMCPRemoteProxy(ctx, r.Client, proxy)
if err != nil {
log.FromContext(ctx).Error(err, "Failed to fetch MCPTelemetryConfig for CA bundle volume")
return
}
if telCfg != nil {
caVolumes, caMounts := ctrlutil.AddTelemetryCABundleVolumes(telCfg)
*volumes = append(*volumes, caVolumes...)
*volumeMounts = append(*volumeMounts, caMounts...)
}
}
// buildEnvVarsForProxy builds environment variables for the proxy container
func (r *MCPRemoteProxyReconciler) buildEnvVarsForProxy(
ctx context.Context, proxy *mcpv1beta1.MCPRemoteProxy,
) []corev1.EnvVar {
env := r.buildOIDCClientSecretEnvVars(ctx, proxy)
// Add token exchange environment variables
// Note: Embedded auth server env vars are added separately in deploymentForMCPRemoteProxy
// to avoid duplicate API calls.
if proxy.Spec.ExternalAuthConfigRef != nil {
tokenExchangeEnvVars, err := ctrlutil.GenerateTokenExchangeEnvVars(
ctx,
r.Client,
proxy.Namespace,
proxy.Spec.ExternalAuthConfigRef,
ctrlutil.GetExternalAuthConfigByName,
)
if err != nil {
ctxLogger := log.FromContext(ctx)
ctxLogger.Error(err, "Failed to generate token exchange environment variables")
} else {
env = append(env, tokenExchangeEnvVars...)
}
// Add bearer token environment variables
bearerTokenEnvVars, err := ctrlutil.GenerateBearerTokenEnvVar(
ctx,
r.Client,
proxy.Namespace,
proxy.Spec.ExternalAuthConfigRef,
ctrlutil.GetExternalAuthConfigByName,
)
if err != nil {
ctxLogger := log.FromContext(ctx)
ctxLogger.Error(err, "Failed to generate bearer token environment variables")
} else {
env = append(env, bearerTokenEnvVars...)
}
}
// Add header forward secret environment variables
if proxy.Spec.HeaderForward != nil && len(proxy.Spec.HeaderForward.AddHeadersFromSecret) > 0 {
// Set secrets provider to environment so runner uses environment variables for secrets.
// This is needed because header forward secrets use the ToolHive secrets provider
// (unlike token exchange and OIDC secrets which read directly from os.Getenv).
// The EnvironmentProvider reads env vars with the TOOLHIVE_SECRET_ prefix.
env = append(env, corev1.EnvVar{
Name: "TOOLHIVE_SECRETS_PROVIDER",
Value: "environment",
})
headerEnvVars := buildHeaderForwardSecretEnvVars(proxy)
env = append(env, headerEnvVars...)
}
// Add user-specified environment variables
if proxy.Spec.ResourceOverrides != nil && proxy.Spec.ResourceOverrides.ProxyDeployment != nil {
for _, envVar := range proxy.Spec.ResourceOverrides.ProxyDeployment.Env {
env = append(env, corev1.EnvVar{
Name: envVar.Name,
Value: envVar.Value,
})
}
}
return ctrlutil.EnsureRequiredEnvVars(ctx, env)
}
// buildOIDCClientSecretEnvVars returns OIDC client secret env vars when the proxy
// references an MCPOIDCConfig with an inline client secret. Returns nil otherwise.
func (r *MCPRemoteProxyReconciler) buildOIDCClientSecretEnvVars(
ctx context.Context, proxy *mcpv1beta1.MCPRemoteProxy,
) []corev1.EnvVar {
if proxy.Spec.OIDCConfigRef == nil {
return nil
}
oidcCfg, err := ctrlutil.GetOIDCConfigForServer(ctx, r.Client, proxy.Namespace, proxy.Spec.OIDCConfigRef)
if err != nil {
log.FromContext(ctx).Error(err, "Failed to fetch MCPOIDCConfig for client secret")
return nil
}
if oidcCfg == nil ||
oidcCfg.Spec.Type != mcpv1beta1.MCPOIDCConfigTypeInline ||
oidcCfg.Spec.Inline == nil {
return nil
}
envVar, err := ctrlutil.GenerateOIDCClientSecretEnvVar(
ctx, r.Client, proxy.Namespace, oidcCfg.Spec.Inline.ClientSecretRef,
)
if err != nil {
log.FromContext(ctx).Error(err, "Failed to generate OIDC client secret environment variable")
return nil
}
if envVar == nil {
return nil
}
return []corev1.EnvVar{*envVar}
}
// buildHeaderForwardSecretEnvVars builds environment variables for header forward secrets.
// Each secret is mounted as an env var using Kubernetes SecretKeyRef, with a name following
// the TOOLHIVE_SECRET_<identifier> pattern expected by the secrets.EnvironmentProvider.
func buildHeaderForwardSecretEnvVars(proxy *mcpv1beta1.MCPRemoteProxy) []corev1.EnvVar {
var envVars []corev1.EnvVar
for _, headerSecret := range proxy.Spec.HeaderForward.AddHeadersFromSecret {
if headerSecret.ValueSecretRef == nil {
continue
}
// Generate env var name following the TOOLHIVE_SECRET_ pattern
envVarName, _ := ctrlutil.GenerateHeaderForwardSecretEnvVarName(proxy.Name, headerSecret.HeaderName)
envVars = append(envVars, corev1.EnvVar{
Name: envVarName,
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: &corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: headerSecret.ValueSecretRef.Name,
},
Key: headerSecret.ValueSecretRef.Key,
},
},
})
}
return envVars
}
// buildDeploymentMetadata builds deployment-level labels and annotations
func (*MCPRemoteProxyReconciler) buildDeploymentMetadata(
baseLabels map[string]string, proxy *mcpv1beta1.MCPRemoteProxy,
) (map[string]string, map[string]string) {
deploymentLabels := baseLabels
deploymentAnnotations := make(map[string]string)
if proxy.Spec.ResourceOverrides != nil && proxy.Spec.ResourceOverrides.ProxyDeployment != nil {
if proxy.Spec.ResourceOverrides.ProxyDeployment.Labels != nil {
deploymentLabels = ctrlutil.MergeLabels(baseLabels, proxy.Spec.ResourceOverrides.ProxyDeployment.Labels)
}
if proxy.Spec.ResourceOverrides.ProxyDeployment.Annotations != nil {
deploymentAnnotations = ctrlutil.MergeAnnotations(
make(map[string]string), proxy.Spec.ResourceOverrides.ProxyDeployment.Annotations,
)
}
}
return deploymentLabels, deploymentAnnotations
}
// buildPodTemplateMetadata builds pod template labels and annotations.
//
// The runConfigChecksum parameter must be a non-empty SHA256 hash of the RunConfig.
// This checksum is added as an annotation to the pod template, which triggers
// Kubernetes to perform a rolling update when the configuration changes.
//
// User-specified overrides from ResourceOverrides.PodTemplateMetadataOverrides
// are merged after the checksum annotation is set.
func (*MCPRemoteProxyReconciler) buildPodTemplateMetadata(
baseLabels map[string]string, proxy *mcpv1beta1.MCPRemoteProxy, runConfigChecksum string,
) (map[string]string, map[string]string) {
templateLabels := baseLabels
templateAnnotations := make(map[string]string)
// Add RunConfig checksum annotation to trigger pod rollout when config changes
// This is critical for ensuring pods restart with updated configuration
templateAnnotations = checksum.AddRunConfigChecksumToPodTemplate(templateAnnotations, runConfigChecksum)
if proxy.Spec.ResourceOverrides != nil &&
proxy.Spec.ResourceOverrides.ProxyDeployment != nil &&
proxy.Spec.ResourceOverrides.ProxyDeployment.PodTemplateMetadataOverrides != nil {
overrides := proxy.Spec.ResourceOverrides.ProxyDeployment.PodTemplateMetadataOverrides
if overrides.Labels != nil {
templateLabels = ctrlutil.MergeLabels(baseLabels, overrides.Labels)
}
if overrides.Annotations != nil {
templateAnnotations = ctrlutil.MergeAnnotations(templateAnnotations, overrides.Annotations)
}
}
return templateLabels, templateAnnotations
}
// buildSecurityContexts builds pod and container security contexts
func (r *MCPRemoteProxyReconciler) buildSecurityContexts(
ctx context.Context, proxy *mcpv1beta1.MCPRemoteProxy,
) (*corev1.PodSecurityContext, *corev1.SecurityContext) {
if r.PlatformDetector == nil {
r.PlatformDetector = ctrlutil.NewSharedPlatformDetector()
}
detectedPlatform, err := r.PlatformDetector.DetectPlatform(ctx)
if err != nil {
ctxLogger := log.FromContext(ctx)
ctxLogger.Error(err, "Failed to detect platform, defaulting to Kubernetes", "mcpremoteproxy", proxy.Name)
}
securityBuilder := kubernetes.NewSecurityContextBuilder(detectedPlatform)
return securityBuilder.BuildPodSecurityContext(), securityBuilder.BuildContainerSecurityContext()
}
// buildContainerPorts builds container port configuration
func (*MCPRemoteProxyReconciler) buildContainerPorts(proxy *mcpv1beta1.MCPRemoteProxy) []corev1.ContainerPort {
return []corev1.ContainerPort{{
ContainerPort: int32(proxy.GetProxyPort()),
Name: "http",
Protocol: corev1.ProtocolTCP,
}}
}
// serviceForMCPRemoteProxy returns a MCPRemoteProxy Service object
func (r *MCPRemoteProxyReconciler) serviceForMCPRemoteProxy(
ctx context.Context, proxy *mcpv1beta1.MCPRemoteProxy,
) *corev1.Service {
ls := labelsForMCPRemoteProxy(proxy.Name)
svcName := createProxyServiceName(proxy.Name)
// Build service metadata with overrides
serviceLabels, serviceAnnotations := r.buildServiceMetadata(ls, proxy)
sessionAffinity := func() corev1.ServiceAffinity {
if proxy.Spec.SessionAffinity != "" {
return corev1.ServiceAffinity(proxy.Spec.SessionAffinity)
}
return corev1.ServiceAffinityClientIP
}()
svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: svcName,
Namespace: proxy.Namespace,
Labels: serviceLabels,
Annotations: serviceAnnotations,
},
Spec: corev1.ServiceSpec{
Selector: ls,
SessionAffinity: sessionAffinity,
Ports: []corev1.ServicePort{{
Port: int32(proxy.GetProxyPort()),
TargetPort: intstr.FromInt(int(proxy.GetProxyPort())),
Protocol: corev1.ProtocolTCP,
Name: "http",
}},
},
}
if err := controllerutil.SetControllerReference(proxy, svc, r.Scheme); err != nil {
ctxLogger := log.FromContext(ctx)
ctxLogger.Error(err, "Failed to set controller reference for Service")
return nil
}
return svc
}
// buildServiceMetadata builds service labels and annotations
func (*MCPRemoteProxyReconciler) buildServiceMetadata(
baseLabels map[string]string, proxy *mcpv1beta1.MCPRemoteProxy,
) (map[string]string, map[string]string) {
serviceLabels := baseLabels
serviceAnnotations := make(map[string]string)
if proxy.Spec.ResourceOverrides != nil && proxy.Spec.ResourceOverrides.ProxyService != nil {
if proxy.Spec.ResourceOverrides.ProxyService.Labels != nil {
serviceLabels = ctrlutil.MergeLabels(baseLabels, proxy.Spec.ResourceOverrides.ProxyService.Labels)
}
if proxy.Spec.ResourceOverrides.ProxyService.Annotations != nil {
serviceAnnotations = ctrlutil.MergeAnnotations(
make(map[string]string), proxy.Spec.ResourceOverrides.ProxyService.Annotations,
)
}
}
return serviceLabels, serviceAnnotations
}