Add PVC source support for MCPRegistry #2719

jonburdo · 2025-11-25T03:40:26Z

Enables MCPRegistry resources to use PersistentVolumeClaims as a data source in addition to existing ConfigMap, Git, and API sources.

🤖 Generated with Claude Code

codecov · 2025-11-25T07:33:30Z

Codecov Report

❌ Patch coverage is 91.17647% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 56.51%. Comparing base (8dae561) to head (9f9e23b).
⚠️ Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
...md/thv-operator/pkg/registryapi/podtemplatespec.go	91.30%	2 Missing ⚠️
cmd/thv-operator/pkg/registryapi/config/config.go	90.90%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2719      +/-   ##
==========================================
- Coverage   56.53%   56.51%   -0.03%     
==========================================
  Files         319      319              
  Lines       30885    30917      +32     
==========================================
+ Hits        17462    17473      +11     
- Misses      11930    11951      +21     
  Partials     1493     1493

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

dmartinol

Thanks for your contribution!
I commented with some concerns about using the configured values, please TAL!

dmartinol · 2025-11-25T07:47:34Z

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

+	if r.Spec.Source.PVCRef == nil {
+		return "registry.json"
+	}
+
+	if r.Spec.Source.PVCRef.Path == "" {
+		return "registry.json"
+	}


can we collapse these to a single if check?

if r.Spec.Source.PVCRef == nil || r.Spec.Source.PVCRef.Path == ""

dmartinol · 2025-11-25T07:50:56Z

cmd/thv-operator/pkg/registryapi/config/config.go

+		// this stops the registry server worrying about PVC sources when all it has to do
+		// is read the file on startup
+		sourceConfig.File = &FileConfig{
+			Path: filepath.Join(RegistryJSONFilePath, RegistryJSONFileName),


instead of the constant RegistryJSONFileName, shouldn't we return the configured value at registrySpec.PvvcRef.Key?
in case, pls add a proper test to validate

BTW: I see that the same constant is returned when a ConfigMap is defined , we need to track with an issue and fix

I've added #2749

dmartinol · 2025-11-25T07:53:20Z

cmd/thv-operator/pkg/registryapi/config/config_test.go

+		// The custom path is handled by the volume mount, not the config
+		assert.Equal(t, SourceTypeFile, config.Source.Type)
+		require.NotNil(t, config.Source.File)
+		assert.Equal(t, filepath.Join(RegistryJSONFilePath, RegistryJSONFileName), config.Source.File.Path)


this should instead return the custom path custom/path/registry.json

dmartinol · 2025-11-25T07:54:40Z

examples/operator/mcp-registries/mcpregistry-pvc.yaml

+# Example Job to populate the PVC with registry data
+# This job can be run once to initialize the PVC, or periodically to update it
+apiVersion: batch/v1
+kind: Job


good job 👍

dmartinol · 2025-11-25T11:51:29Z

Need some adjustment to adapt to the new model:

naming review
multiple registries (FKA source)
The latter implies that the mounted path should use the regisstry name to create a sub-folder.
Finally, it would be great if you can extend the existing IT with this use case (maybe having a config with both ConfigMap and PVC)

dmartinol · 2025-11-27T06:15:18Z

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

+
+	// RegistrySourceTypePVC is the type for registry data stored in PersistentVolumeClaims
+	RegistrySourceTypePVC = "pvc"
 )


This constant and also the others above can be safely removed IMO (missed to drop them in another cleanup task): can you pls remove all the const block?

dmartinol · 2025-11-27T06:19:30Z

cmd/thv-operator/pkg/registryapi/config/config.go

+		pvcPath := RegistryJSONFileName
+		if registrySpec.PVCRef.Path != "" {
+			pvcPath = registrySpec.PVCRef.Path
+		}


Try using the buildFilePath function instead, to include the registry name in the path (otherwise we could have duplicated file paths in the server config)

dmartinol · 2025-11-27T06:20:19Z

cmd/thv-operator/pkg/registryapi/config/config_test.go

+		assert.Equal(t, mcpv1alpha1.RegistryFormatToolHive, config.Registries[0].Format)
+		require.NotNil(t, config.Registries[0].File)
+		// Path defaults to registry.json at PVC root
+		assert.Equal(t, filepath.Join(RegistryJSONFilePath, RegistryJSONFileName), config.Registries[0].File.Path)


after the above change, the expected path includes the registry name

dmartinol

Please take a look at the REGISTRY.md file to include the new registry type (BTW: if you can, please also replace the "data sources" to "registries", it's another leftover of previous PRs

Enables MCPRegistry resources to use PersistentVolumeClaims as a data source in addition to existing ConfigMap, Git, and API sources. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Jon Burdo <jon@jonburdo.com>

jonburdo · 2025-12-01T03:32:48Z

A few notes:

I changed the mount path to simply use the pvc claim name instead of registry name ({RegistryJSONFilePath}/{claimName}/) for the mount path, since a single pvc could contain multiple registry files.
I suggest switching "source" to "registry" in a followup to narrow the scope. I'm happy to do this - tracked in Rename Source to Registry #2815

github-actions

Large PR Detected

This PR exceeds 1000 lines of changes and requires justification before it can be reviewed.

How to unblock this PR:

Add a section to your PR description with the following format:

## Large PR Justification

[Explain why this PR must be large, such as:]
- Generated code that cannot be split
- Large refactoring that must be atomic
- Multiple related changes that would break if separated
- Migration or data transformation

Alternative:

Consider splitting this PR into smaller, focused changes (< 1000 lines each) for easier review and reduced risk.

See our Contributing Guidelines for more details.

This review will be automatically dismissed once you add the justification section.

dmartinol reviewed Nov 25, 2025

View reviewed changes

github-actions bot added the size/L Large PR: 600-999 lines changed label Nov 25, 2025

jonburdo marked this pull request as draft November 26, 2025 03:27

jonburdo mentioned this pull request Nov 26, 2025

Use correct path for ConfigMap registry #2749

Open

jonburdo force-pushed the pvc-source branch 3 times, most recently from 27c80e2 to 632f5b0 Compare November 27, 2025 03:59

jonburdo marked this pull request as ready for review November 27, 2025 04:02

dmartinol reviewed Nov 27, 2025

View reviewed changes

jonburdo force-pushed the pvc-source branch from 632f5b0 to 9f9e23b Compare December 1, 2025 03:12

jonburdo mentioned this pull request Dec 1, 2025

Rename Source to Registry #2815

Open

github-actions bot removed the size/L Large PR: 600-999 lines changed label Dec 1, 2025

github-actions bot requested changes Dec 1, 2025

View reviewed changes

github-actions bot added the size/XL Extra large PR: 1000+ lines changed label Dec 1, 2025

Add PVC source support for MCPRegistry #2719

Are you sure you want to change the base?

Add PVC source support for MCPRegistry #2719

Conversation

jonburdo commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dmartinol left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmartinol commented Nov 25, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmartinol left a comment

Choose a reason for hiding this comment

Uh oh!

jonburdo commented Dec 1, 2025

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Large PR Detected

How to unblock this PR:

Alternative:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jonburdo commented Nov 25, 2025 •

edited

Loading

codecov bot commented Nov 25, 2025 •

edited

Loading