Add PVC source support for MCPRegistry

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 <[email protected]>
Signed-off-by: Jon Burdo <[email protected]>

Author: jonburdo

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

@@ -16,6 +16,9 @@ const (
 
 	// RegistrySourceTypeAPI is the type for registry data fetched from API endpoints
 	RegistrySourceTypeAPI = "api"
+
+	// RegistrySourceTypePVC is the type for registry data stored in PersistentVolumeClaims
+	RegistrySourceTypePVC = "pvc"
 )
 
 // Registry formats
@@ -58,20 +61,25 @@ type MCPRegistryConfig struct {
 	Format string `json:"format,omitempty"`
 
 	// ConfigMapRef defines the ConfigMap source configuration
-	// Mutually exclusive with Git and API
+	// Mutually exclusive with Git, API, and PVCRef
 	// +optional
 	ConfigMapRef *corev1.ConfigMapKeySelector `json:"configMapRef,omitempty"`
 
 	// Git defines the Git repository source configuration
-	// Mutually exclusive with ConfigMapRef and API
+	// Mutually exclusive with ConfigMapRef, API, and PVCRef
 	// +optional
 	Git *GitSource `json:"git,omitempty"`
 
 	// API defines the API source configuration
-	// Mutually exclusive with ConfigMapRef and Git
+	// Mutually exclusive with ConfigMapRef, Git, and PVCRef
 	// +optional
 	API *APISource `json:"api,omitempty"`
 
+	// PVCRef defines the PersistentVolumeClaim source configuration
+	// Mutually exclusive with ConfigMapRef, Git, and API
+	// +optional
+	PVCRef *PVCSource `json:"pvcRef,omitempty"`
+
 	// SyncPolicy defines the automatic synchronization behavior for this registry.
 	// If specified, enables automatic synchronization at the given interval.
 	// Manual synchronization is always supported via annotation-based triggers
@@ -131,6 +139,20 @@ type APISource struct {
 	Endpoint string `json:"endpoint"`
 }
 
+// PVCSource defines PersistentVolumeClaim source configuration
+type PVCSource struct {
+	// ClaimName is the name of the PersistentVolumeClaim
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinLength=1
+	ClaimName string `json:"claimName"`
+
+	// Path is the path to the registry file within the PVC
+	// +kubebuilder:validation:Pattern=^.*\.json$
+	// +kubebuilder:default=registry.json
+	// +optional
+	Path string `json:"path,omitempty"`
+}
+
 // SyncPolicy defines automatic synchronization behavior.
 // When specified, enables automatic synchronization at the given interval.
 // Manual synchronization via annotation-based triggers is always available
@@ -392,6 +414,62 @@ func (r *MCPRegistry) GetAPIResourceName() string {
 	return fmt.Sprintf("%s-api", r.Name)
 }
 
+// IsConfigMapRegistrySource returns true if any registry source is a configmap
+func (r *MCPRegistry) IsConfigMapRegistrySource() bool {
+	for _, registry := range r.Spec.Registries {
+		if registry.ConfigMapRef != nil {
+			return true
+		}
+	}
+	return false
+}
+
+// GetConfigMapSourceName returns the name of the first configmap source
+// if present, otherwise returns an empty string
+func (r *MCPRegistry) GetConfigMapSourceName() string {
+	for _, registry := range r.Spec.Registries {
+		if registry.ConfigMapRef != nil {
+			return registry.ConfigMapRef.Name
+		}
+	}
+	return ""
+}
+
+// IsPVCRegistrySource checks if any registry uses a PVC source
+func (r *MCPRegistry) IsPVCRegistrySource() bool {
+	for _, registry := range r.Spec.Registries {
+		if registry.PVCRef != nil {
+			return true
+		}
+	}
+	return false
+}
+
+// GetPVCSourceName returns the name of the first PVC source
+// if present, otherwise returns an empty string
+func (r *MCPRegistry) GetPVCSourceName() string {
+	for _, registry := range r.Spec.Registries {
+		if registry.PVCRef != nil {
+			return registry.PVCRef.ClaimName
+		}
+	}
+	return ""
+}
+
+// GetPVCSourcePath returns the path within the PVC for the first PVC source
+// if present, otherwise returns "registry.json" as default
+func (r *MCPRegistry) GetPVCSourcePath() string {
+	for _, registry := range r.Spec.Registries {
+		if registry.PVCRef != nil {
+			if registry.PVCRef.Path != "" {
+				return registry.PVCRef.Path
+			}
+			return "registry.json"
+		}
+	}
+	return "registry.json"
+}
+
 // DeriveOverallPhase determines the overall MCPRegistry phase based on sync and API status
 func (r *MCPRegistry) DeriveOverallPhase() MCPRegistryPhase {
 	syncStatus := r.Status.SyncStatus

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

@@ -247,11 +247,16 @@ func validateRegistryNames(registries []mcpv1alpha1.MCPRegistryConfig) error {
 }
 
 func buildFilePath(registryName string) *FileConfig {
+	return buildFilePathWithFilename(registryName, RegistryJSONFileName)
+}
+
+func buildFilePathWithFilename(registryName, filename string) *FileConfig {
 	return &FileConfig{
-		Path: filepath.Join(RegistryJSONFilePath, registryName, RegistryJSONFileName),
+		Path: filepath.Join(RegistryJSONFilePath, registryName, filename),
 	}
 }
 
+//nolint:gocyclo // Complexity is acceptable for handling multiple source types
 func buildRegistryConfig(registrySpec *mcpv1alpha1.MCPRegistryConfig) (*RegistryConfig, error) {
 	if registrySpec.Name == "" {
 		return nil, fmt.Errorf("registry name is required")
@@ -292,12 +297,24 @@ func buildRegistryConfig(registrySpec *mcpv1alpha1.MCPRegistryConfig) (*Registry
 		}
 		registryConfig.API = apiConfig
 	}
+	if registrySpec.PVCRef != nil {
+		sourceCount++
+		// we use the file source config for PVC sources
+		// because the PVC will be mounted as a file in the registry server container.
+		// this stops the registry server worrying about PVC sources when all it has to do
+		// is read the file on startup
+		filename := RegistryJSONFileName
+		if registrySpec.PVCRef.Path != "" {
+			filename = registrySpec.PVCRef.Path
+		}
+		registryConfig.File = buildFilePathWithFilename(registrySpec.Name, filename)
+	}
 
 	if sourceCount == 0 {
-		return nil, fmt.Errorf("exactly one source type (ConfigMapRef, Git, or API) must be specified")
+		return nil, fmt.Errorf("exactly one source type (ConfigMapRef, Git, API, or PVCRef) must be specified")
 	}
 	if sourceCount > 1 {
-		return nil, fmt.Errorf("only one source type (ConfigMapRef, Git, or API) can be specified")
+		return nil, fmt.Errorf("only one source type (ConfigMapRef, Git, API, or PVCRef) can be specified")
 	}
 
 	// Build sync policy

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

@@ -1000,3 +1000,124 @@ func TestBuildConfig_MultipleRegistries(t *testing.T) {
 	require.NotNil(t, config.Registries[1].Filter.Names)
 	assert.Equal(t, []string{"server-*"}, config.Registries[1].Filter.Names.Include)
 }
+
+func TestBuildConfig_PVCSource(t *testing.T) {
+	t.Parallel()
+
+	t.Run("valid pvc source with default path", func(t *testing.T) {
+		t.Parallel()
+		mcpRegistry := &mcpv1alpha1.MCPRegistry{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "test-registry",
+			},
+			Spec: mcpv1alpha1.MCPRegistrySpec{
+				Registries: []mcpv1alpha1.MCPRegistryConfig{
+					{
+						Name:   "pvc-registry",
+						Format: mcpv1alpha1.RegistryFormatToolHive,
+						PVCRef: &mcpv1alpha1.PVCSource{
+							ClaimName: "registry-data-pvc",
+						},
+						SyncPolicy: &mcpv1alpha1.SyncPolicy{
+							Interval: "1h",
+						},
+					},
+				},
+			},
+		}
+
+		manager := NewConfigManagerForTesting(mcpRegistry)
+		config, err := manager.BuildConfig()
+
+		require.NoError(t, err)
+		require.NotNil(t, config)
+		assert.Equal(t, "test-registry", config.RegistryName)
+		require.Len(t, config.Registries, 1)
+		assert.Equal(t, "pvc-registry", config.Registries[0].Name)
+		assert.Equal(t, mcpv1alpha1.RegistryFormatToolHive, config.Registries[0].Format)
+		require.NotNil(t, config.Registries[0].File)
+		assert.Equal(t, filepath.Join(RegistryJSONFilePath, "pvc-registry", RegistryJSONFileName), config.Registries[0].File.Path)
+	})
+
+	t.Run("valid pvc source with custom path", func(t *testing.T) {
+		t.Parallel()
+		mcpRegistry := &mcpv1alpha1.MCPRegistry{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "test-registry",
+			},
+			Spec: mcpv1alpha1.MCPRegistrySpec{
+				Registries: []mcpv1alpha1.MCPRegistryConfig{
+					{
+						Name:   "custom-pvc",
+						Format: mcpv1alpha1.RegistryFormatToolHive,
+						PVCRef: &mcpv1alpha1.PVCSource{
+							ClaimName: "registry-data-pvc",
+							Path:      "custom-registry.json",
+						},
+						SyncPolicy: &mcpv1alpha1.SyncPolicy{
+							Interval: "30m",
+						},
+					},
+				},
+			},
+		}
+
+		manager := NewConfigManagerForTesting(mcpRegistry)
+		config, err := manager.BuildConfig()
+
+		require.NoError(t, err)
+		require.NotNil(t, config)
+		require.Len(t, config.Registries, 1)
+		assert.Equal(t, "custom-pvc", config.Registries[0].Name)
+		require.NotNil(t, config.Registries[0].File)
+		// Path uses the custom path specified in PVCRef.Path
+		assert.Equal(t, filepath.Join(RegistryJSONFilePath, "custom-pvc", "custom-registry.json"), config.Registries[0].File.Path)
+	})
+
+	t.Run("valid pvc source with filter", func(t *testing.T) {
+		t.Parallel()
+		mcpRegistry := &mcpv1alpha1.MCPRegistry{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "test-registry",
+			},
+			Spec: mcpv1alpha1.MCPRegistrySpec{
+				Registries: []mcpv1alpha1.MCPRegistryConfig{
+					{
+						Name:   "filtered-pvc",
+						Format: mcpv1alpha1.RegistryFormatToolHive,
+						PVCRef: &mcpv1alpha1.PVCSource{
+							ClaimName: "registry-data-pvc",
+							Path:      "registry.json",
+						},
+						SyncPolicy: &mcpv1alpha1.SyncPolicy{
+							Interval: "15m",
+						},
+						Filter: &mcpv1alpha1.RegistryFilter{
+							NameFilters: &mcpv1alpha1.NameFilter{
+								Include: []string{"prod-*"},
+							},
+							Tags: &mcpv1alpha1.TagFilter{
+								Include: []string{"production"},
+							},
+						},
+					},
+				},
+			},
+		}
+
+		manager := NewConfigManagerForTesting(mcpRegistry)
+		config, err := manager.BuildConfig()
+
+		require.NoError(t, err)
+		require.NotNil(t, config)
+		require.Len(t, config.Registries, 1)
+		assert.Equal(t, "filtered-pvc", config.Registries[0].Name)
+		require.NotNil(t, config.Registries[0].File)
+		// Verify filter is preserved
+		require.NotNil(t, config.Registries[0].Filter)
+		require.NotNil(t, config.Registries[0].Filter.Names)
+		assert.Equal(t, []string{"prod-*"}, config.Registries[0].Filter.Names.Include)
+		require.NotNil(t, config.Registries[0].Filter.Tags)
+		assert.Equal(t, []string{"production"}, config.Registries[0].Filter.Tags.Include)
+	})
+}