adds creation of configmap for registry server config (#2558)

* adds creation of configmap for mcpregstry config

Signed-off-by: ChrisJBurns <[email protected]>

* clean

Signed-off-by: ChrisJBurns <[email protected]>

* adds git source int test

Signed-off-by: ChrisJBurns <[email protected]>

* corrects tests assertions

Signed-off-by: ChrisJBurns <[email protected]>

* changes some paths as a test

Signed-off-by: ChrisJBurns <[email protected]>

* adds emptyDir volume mount for temp storage

Signed-off-by: ChrisJBurns <[email protected]>

* refactor to reduce duplication

Signed-off-by: ChrisJBurns <[email protected]>

* lint

Signed-off-by: ChrisJBurns <[email protected]>

---------

Signed-off-by: ChrisJBurns <[email protected]>

Author: ChrisJBurns

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

@@ -405,6 +405,25 @@ func (r *MCPRegistry) GetAPIResourceName() string {
 	return fmt.Sprintf("%s-api", r.Name)
 }
 
+// IsConfigMapRegistrySource returns true if the registry source is a configmap
+func (r *MCPRegistry) IsConfigMapRegistrySource() bool {
+	return r.Spec.Source.Type == RegistrySourceTypeConfigMap
+}
+
+// GetConfigMapSourceName returns the name of the configmap source
+// if its present, otherwise returns an empty string
+func (r *MCPRegistry) GetConfigMapSourceName() string {
+	if !r.IsConfigMapRegistrySource() {
+		return ""
+	}
+
+	if r.Spec.Source.ConfigMap == nil {
+		return ""
+	}
+
+	return r.Spec.Source.ConfigMap.Name
+}
+
 // DeriveOverallPhase determines the overall MCPRegistry phase based on sync and API status
 func (r *MCPRegistry) DeriveOverallPhase() MCPRegistryPhase {
 	syncStatus := r.Status.SyncStatus

cmd/thv-operator/controllers/mcpregistry_controller.go

@@ -60,7 +60,6 @@ func getCurrentAttemptCount(mcpRegistry *mcpv1alpha1.MCPRegistry) int {
 func NewMCPRegistryReconciler(k8sClient client.Client, scheme *runtime.Scheme) *MCPRegistryReconciler {
 	syncManager := sync.NewDefaultSyncManager(k8sClient, scheme)
 	registryAPIManager := registryapi.NewManager(k8sClient, scheme)
-
 	return &MCPRegistryReconciler{
 		Client:             k8sClient,
 		Scheme:             scheme,

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

@@ -3,6 +3,7 @@ package config
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 
 	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
@@ -20,18 +21,20 @@ import (
 //
 //nolint:revive
 type ConfigManager interface {
-	BuildConfig(mcpRegistry *mcpv1alpha1.MCPRegistry) (*Config, error)
+	BuildConfig() (*Config, error)
 	UpsertConfigMap(ctx context.Context,
 		mcpRegistry *mcpv1alpha1.MCPRegistry,
 		desired *corev1.ConfigMap,
 	) error
+	GetRegistryServerConfigMapName() string
 }
 
 // NewConfigManager creates a new instance of ConfigManager with required dependencies
 func NewConfigManager(
 	k8sClient client.Client,
 	scheme *runtime.Scheme,
 	checksumManager checksum.RunConfigConfigMapChecksum,
+	mcpRegistry *mcpv1alpha1.MCPRegistry,
 ) (ConfigManager, error) {
 	if k8sClient == nil {
 		return nil, fmt.Errorf("k8sClient is required and cannot be nil")
@@ -42,20 +45,33 @@ func NewConfigManager(
 	if checksumManager == nil {
 		return nil, fmt.Errorf("checksumManager is required and cannot be nil")
 	}
-	return &configManager{client: k8sClient, scheme: scheme, checksum: checksumManager}, nil
+
+	return &configManager{
+		client:      k8sClient,
+		scheme:      scheme,
+		checksum:    checksumManager,
+		mcpRegistry: mcpRegistry,
+	}, nil
 }
 
 // NewConfigManagerForTesting creates a ConfigManager for testing purposes only.
 // WARNING: This manager will panic if methods requiring dependencies are called.
 // Only use this for testing BuildConfig or other methods that don't use k8s client.
-func NewConfigManagerForTesting() ConfigManager {
-	return &configManager{}
+func NewConfigManagerForTesting(mcpRegistry *mcpv1alpha1.MCPRegistry) ConfigManager {
+	return &configManager{
+		mcpRegistry: mcpRegistry,
+	}
 }
 
 type configManager struct {
-	client   client.Client
-	scheme   *runtime.Scheme
-	checksum checksum.RunConfigConfigMapChecksum
+	client      client.Client
+	scheme      *runtime.Scheme
+	checksum    checksum.RunConfigConfigMapChecksum
+	mcpRegistry *mcpv1alpha1.MCPRegistry
+}
+
+func (cm *configManager) GetRegistryServerConfigMapName() string {
+	return fmt.Sprintf("%s-registry-server-config", cm.mcpRegistry.Name)
 }
 
 const (
@@ -69,7 +85,16 @@ const (
 	SourceTypeFile = "file"
 
 	// RegistryJSONFilePath is the file path where the registry JSON file will be mounted
-	RegistryJSONFilePath = "/etc/registry/registry.json"
+	RegistryJSONFilePath = "/config/registry"
+
+	// RegistryJSONFileName is the name of the registry JSON file
+	RegistryJSONFileName = "registry.json"
+
+	// RegistryServerConfigFilePath is the file path where the registry server config file will be mounted
+	RegistryServerConfigFilePath = "/config"
+
+	// RegistryServerConfigFileName is the name of the registry server config file
+	RegistryServerConfigFileName = "config.yaml"
 )
 
 // Config represents the root configuration structure
@@ -159,22 +184,24 @@ func (c *Config) ToConfigMapWithContentChecksum(mcpRegistry *mcpv1alpha1.MCPRegi
 
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("%s-configmap", c.RegistryName),
+			Name:      fmt.Sprintf("%s-registry-server-config", c.RegistryName),
 			Namespace: mcpRegistry.Namespace,
 			Annotations: map[string]string{
 				checksum.ContentChecksumAnnotation: ctrlutil.CalculateConfigHash(yamlData),
 			},
 		},
 		Data: map[string]string{
-			"config.yaml": string(yamlData),
+			RegistryServerConfigFileName: string(yamlData),
 		},
 	}
 	return configMap, nil
 }
 
-func (*configManager) BuildConfig(mcpRegistry *mcpv1alpha1.MCPRegistry) (*Config, error) {
+func (cm *configManager) BuildConfig() (*Config, error) {
 	config := Config{}
 
+	mcpRegistry := cm.mcpRegistry
+
 	if mcpRegistry.Name == "" {
 		return nil, fmt.Errorf("registry name is required")
 	}
@@ -254,7 +281,7 @@ func buildSourceConfig(source *mcpv1alpha1.MCPRegistrySource, config *Config) er
 		// this stops the registry server worrying about configmap sources when all it has to do
 		// is read the file on startup
 		sourceConfig.File = &FileConfig{
-			Path: RegistryJSONFilePath,
+			Path: filepath.Join(RegistryJSONFilePath, RegistryJSONFileName),
 		}
 		sourceConfig.Type = SourceTypeFile
 	case mcpv1alpha1.RegistrySourceTypeGit: