Skip to content

Commit cd83151

Browse files
committed
changes from review
1 parent 41d89b5 commit cd83151

File tree

5 files changed

+507
-105
lines changed

5 files changed

+507
-105
lines changed

cmd/thv-operator/controllers/virtualmcpserver_vmcpconfig.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ func (r *VirtualMCPServerReconciler) ensureVmcpConfigConfigMap(
3131
// Create OIDC resolver to handle all OIDC types (kubernetes, configMap, inline)
3232
oidcResolver := oidc.NewResolver(r.Client)
3333

34-
// Convert CRD to vmcp config using converter with OIDC resolver
35-
converter, err := vmcpconfig.NewConverter(oidcResolver)
34+
// Convert CRD to vmcp config using converter with OIDC resolver and Kubernetes client
35+
// The client is needed to fetch referenced VirtualMCPCompositeToolDefinition resources
36+
converter, err := vmcpconfig.NewConverter(oidcResolver, r.Client)
3637
if err != nil {
3738
return fmt.Errorf("failed to create vmcp converter: %w", err)
3839
}

cmd/thv-operator/controllers/virtualmcpserver_vmcpconfig_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ func newNoOpMockResolver(t *testing.T) *oidcmocks.MockResolver {
4747
// newTestConverter creates a Converter with the given resolver, failing the test if creation fails.
4848
func newTestConverter(t *testing.T, resolver *oidcmocks.MockResolver) *vmcpconfig.Converter {
4949
t.Helper()
50-
converter, err := vmcpconfig.NewConverter(resolver)
50+
scheme := runtime.NewScheme()
51+
_ = mcpv1alpha1.AddToScheme(scheme)
52+
fakeClient := fake.NewClientBuilder().WithScheme(scheme).Build()
53+
converter, err := vmcpconfig.NewConverter(resolver, fakeClient)
5154
require.NoError(t, err)
5255
return converter
5356
}

cmd/thv-operator/main.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@ func setupControllersAndWebhooks(mgr ctrl.Manager) error {
199199
if err := (&mcpv1alpha1.VirtualMCPCompositeToolDefinition{}).SetupWebhookWithManager(mgr); err != nil {
200200
return fmt.Errorf("unable to create webhook VirtualMCPCompositeToolDefinition: %w", err)
201201
}
202+
203+
// Set up MCPExternalAuthConfig webhook
204+
if err := (&mcpv1alpha1.MCPExternalAuthConfig{}).SetupWebhookWithManager(mgr); err != nil {
205+
return fmt.Errorf("unable to create webhook MCPExternalAuthConfig: %w", err)
206+
}
202207
//+kubebuilder:scaffold:builder
203208

204209
return nil

0 commit comments

Comments
 (0)