Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions cmd/thv-operator/pkg/registryapi/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,17 @@ type RegistryConfig struct {
Git *GitConfig `yaml:"git,omitempty"`
API *APIConfig `yaml:"api,omitempty"`
File *FileConfig `yaml:"file,omitempty"`
Kubernetes *KubernetesConfig `yaml:"kubernetes,omitempty"`
SyncPolicy *SyncPolicyConfig `yaml:"syncPolicy,omitempty"`
Filter *FilterConfig `yaml:"filter,omitempty"`
}

// KubernetesConfig defines a Kubernetes-based registry source where data is discovered
// from MCPServer resources in the cluster. This is the default type for the built-in "default" registry.
type KubernetesConfig struct {
// Empty struct - presence indicates this is a Kubernetes registry
}

// GitConfig defines Git source settings
type GitConfig struct {
// Repository is the Git repository URL (HTTP/HTTPS/SSH)
Expand Down Expand Up @@ -233,6 +240,9 @@ func (c *Config) ToConfigMapWithContentChecksum(mcpRegistry *mcpv1alpha1.MCPRegi
return configMap, nil
}

// DefaultRegistryName is the name of the default managed registry
const DefaultRegistryName = "default"

func (cm *configManager) BuildConfig() (*Config, error) {
config := Config{}

Expand All @@ -253,15 +263,22 @@ func (cm *configManager) BuildConfig() (*Config, error) {
return nil, fmt.Errorf("invalid registry configuration: %w", err)
}

// Build registry configs
config.Registries = make([]RegistryConfig, 0, len(mcpRegistry.Spec.Registries))
// Build registry configs from user-specified registries
userRegistries := make([]RegistryConfig, 0, len(mcpRegistry.Spec.Registries))
for _, registrySpec := range mcpRegistry.Spec.Registries {
registryConfig, err := buildRegistryConfig(&registrySpec)
if err != nil {
return nil, fmt.Errorf("failed to build registry configuration for %q: %w", registrySpec.Name, err)
}
config.Registries = append(config.Registries, *registryConfig)
userRegistries = append(userRegistries, *registryConfig)
}

// Prepend the default kubernetes registry as the first entry
defaultRegistry := RegistryConfig{
Name: DefaultRegistryName,
Kubernetes: &KubernetesConfig{},
}
config.Registries = append([]RegistryConfig{defaultRegistry}, userRegistries...)

// Build database configuration from CRD spec or use defaults
config.Database = buildDatabaseConfig(mcpRegistry.Spec.DatabaseConfig)
Expand Down
Loading
Loading