stacklok
diff --git a/‎cmd/thv-operator/api/v1alpha1/mcpregistry_types.go‎
Lines changed: 142 additions & 20 deletions b/‎cmd/thv-operator/api/v1alpha1/mcpregistry_types.go‎
Lines changed: 142 additions & 20 deletions
@@ -160,14 +160,58 @@ type TagFilter struct {
 
 // MCPRegistryStatus defines the observed state of MCPRegistry
 type MCPRegistryStatus struct {
-	// Phase represents the current phase of the MCPRegistry
+	// Phase represents the current overall phase of the MCPRegistry
+	// Derived from sync and API status
 	// +optional
 	Phase MCPRegistryPhase `json:"phase,omitempty"`
 
 	// Message provides additional information about the current phase
 	// +optional
 	Message string `json:"message,omitempty"`
 
+	// SyncStatus provides detailed information about data synchronization
+	// +optional
+	SyncStatus *SyncStatus `json:"syncStatus,omitempty"`
+
+	// APIStatus provides detailed information about the API service
+	// +optional
+	APIStatus *APIStatus `json:"apiStatus,omitempty"`
+
+	// StorageRef is a reference to the internal storage location
+	// +optional
+	StorageRef *StorageReference `json:"storageRef,omitempty"`
+
+	// LastManualSyncTrigger tracks the last processed manual sync annotation value
+	// Used to detect new manual sync requests via toolhive.stacklok.dev/sync-trigger annotation
+	// +optional
+	LastManualSyncTrigger string `json:"lastManualSyncTrigger,omitempty"`
+
+	// Conditions represent the latest available observations of the MCPRegistry's state
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+// SyncStatus provides detailed information about data synchronization
+type SyncStatus struct {
+	// Phase represents the current synchronization phase
+	// +kubebuilder:validation:Enum=Idle;Syncing;Complete;Failed
+	Phase SyncPhase `json:"phase"`
+
+	// Message provides additional information about the sync status
+	// +optional
+	Message string `json:"message,omitempty"`
+
+	// LastAttempt is the timestamp of the last sync attempt
+	// +optional
+	LastAttempt *metav1.Time `json:"lastAttempt,omitempty"`
+
+	// AttemptCount is the number of sync attempts since last success
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	AttemptCount int `json:"attemptCount,omitempty"`
+
 	// LastSyncTime is the timestamp of the last successful sync
 	// +optional
 	LastSyncTime *metav1.Time `json:"lastSyncTime,omitempty"`
@@ -181,32 +225,66 @@ type MCPRegistryStatus struct {
 	// +optional
 	// +kubebuilder:validation:Minimum=0
 	ServerCount int `json:"serverCount,omitempty"`
+}
 
-	// SyncAttempts is the number of sync attempts since last success
-	// +optional
-	// +kubebuilder:validation:Minimum=0
-	SyncAttempts int `json:"syncAttempts,omitempty"`
-
-	// APIEndpoint is the URL of the registry API service
-	// +optional
-	APIEndpoint string `json:"apiEndpoint,omitempty"`
+// APIStatus provides detailed information about the API service
+type APIStatus struct {
+	// Phase represents the current API service phase
+	// +kubebuilder:validation:Enum=NotStarted;Deploying;Ready;Unhealthy;Error
+	Phase APIPhase `json:"phase"`
 
-	// StorageRef is a reference to the internal storage location
+	// Message provides additional information about the API status
 	// +optional
-	StorageRef *StorageReference `json:"storageRef,omitempty"`
+	Message string `json:"message,omitempty"`
 
-	// LastManualSyncTrigger tracks the last processed manual sync annotation value
-	// Used to detect new manual sync requests via toolhive.stacklok.dev/sync-trigger annotation
+	// Endpoint is the URL where the API is accessible
 	// +optional
-	LastManualSyncTrigger string `json:"lastManualSyncTrigger,omitempty"`
+	Endpoint string `json:"endpoint,omitempty"`
 
-	// Conditions represent the latest available observations of the MCPRegistry's state
+	// ReadySince is the timestamp when the API became ready
 	// +optional
-	// +listType=map
-	// +listMapKey=type
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	ReadySince *metav1.Time `json:"readySince,omitempty"`
 }
 
+// SyncPhase represents the data synchronization state
+// +kubebuilder:validation:Enum=Idle;Syncing;Complete;Failed
+type SyncPhase string
+
+const (
+	// SyncPhaseIdle means no sync is needed or scheduled
+	SyncPhaseIdle SyncPhase = "Idle"
+
+	// SyncPhaseSyncing means sync is currently in progress
+	SyncPhaseSyncing SyncPhase = "Syncing"
+
+	// SyncPhaseComplete means sync completed successfully
+	SyncPhaseComplete SyncPhase = "Complete"
+
+	// SyncPhaseFailed means sync failed
+	SyncPhaseFailed SyncPhase = "Failed"
+)
+
+// APIPhase represents the API service state
+// +kubebuilder:validation:Enum=NotStarted;Deploying;Ready;Unhealthy;Error
+type APIPhase string
+
+const (
+	// APIPhaseNotStarted means API deployment has not been created
+	APIPhaseNotStarted APIPhase = "NotStarted"
+
+	// APIPhaseDeploying means API is being deployed
+	APIPhaseDeploying APIPhase = "Deploying"
+
+	// APIPhaseReady means API is ready to serve requests
+	APIPhaseReady APIPhase = "Ready"
+
+	// APIPhaseUnhealthy means API is deployed but not healthy
+	APIPhaseUnhealthy APIPhase = "Unhealthy"
+
+	// APIPhaseError means API deployment failed
+	APIPhaseError APIPhase = "Error"
+)
+
 // StorageReference defines a reference to internal storage
 type StorageReference struct {
 	// Type is the storage type (configmap)
@@ -258,8 +336,10 @@ const (
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
-//+kubebuilder:printcolumn:name="Servers",type="integer",JSONPath=".status.serverCount"
-//+kubebuilder:printcolumn:name="Last Sync",type="date",JSONPath=".status.lastSyncTime"
+//+kubebuilder:printcolumn:name="Sync",type="string",JSONPath=".status.syncStatus.phase"
+//+kubebuilder:printcolumn:name="API",type="string",JSONPath=".status.apiStatus.phase"
+//+kubebuilder:printcolumn:name="Servers",type="integer",JSONPath=".status.syncStatus.serverCount"
+//+kubebuilder:printcolumn:name="Last Sync",type="date",JSONPath=".status.syncStatus.lastSyncTime"
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+kubebuilder:resource:scope=Namespaced,categories=toolhive
 //nolint:lll
@@ -294,6 +374,48 @@ func (r *MCPRegistry) GetAPIResourceName() string {
 	return fmt.Sprintf("%s-api", r.Name)
 }
 
+// DeriveOverallPhase determines the overall MCPRegistry phase based on sync and API status
+func (r *MCPRegistry) DeriveOverallPhase() MCPRegistryPhase {
+	syncStatus := r.Status.SyncStatus
+	apiStatus := r.Status.APIStatus
+
+	// Default phases if status not set
+	syncPhase := SyncPhaseIdle
+	if syncStatus != nil {
+		syncPhase = syncStatus.Phase
+	}
+
+	apiPhase := APIPhaseNotStarted
+	if apiStatus != nil {
+		apiPhase = apiStatus.Phase
+	}
+
+	// If sync failed, overall is Failed
+	if syncPhase == SyncPhaseFailed {
+		return MCPRegistryPhaseFailed
+	}
+
+	// If sync in progress, overall is Syncing
+	if syncPhase == SyncPhaseSyncing {
+		return MCPRegistryPhaseSyncing
+	}
+
+	// If sync is complete or idle (no sync needed), check API status
+	if syncPhase == SyncPhaseComplete || syncPhase == SyncPhaseIdle {
+		switch apiPhase {
+		case APIPhaseReady:
+			return MCPRegistryPhaseReady
+		case APIPhaseError:
+			return MCPRegistryPhaseFailed
+		case APIPhaseNotStarted, APIPhaseDeploying, APIPhaseUnhealthy:
+			return MCPRegistryPhasePending // API still starting/not healthy
+		}
+	}
+
+	// Default to pending for initial states
+	return MCPRegistryPhasePending
+}
+
 func init() {
 	SchemeBuilder.Register(&MCPRegistry{}, &MCPRegistryList{})
 }