Use 'Ready' status conditions & remove 'Took' fields

Author: PhilippMatthes

api/v1alpha1/datasource_types.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -225,19 +224,15 @@ type DatasourceSpec struct {
 }
 
 const (
-	// Something went wrong during the syncing of the datasource.
-	DatasourceConditionError = "Error"
-	// The datasource is waiting for a dependency datasource to become available.
-	DatasourceConditionWaiting = "Waiting"
+	// The datasource is ready to be used.
+	DatasourceConditionReady = "Ready"
 )
 
 type DatasourceStatus struct {
 	// When the datasource was last successfully synced.
 	LastSynced metav1.Time `json:"lastSynced,omitempty"`
 	// The number of objects currently stored for this datasource.
 	NumberOfObjects int64 `json:"numberOfObjects,omitempty"`
-	// The time it took to perform the last sync.
-	Took metav1.Duration `json:"took"`
 	// Planned time for the next sync.
 	NextSyncTime metav1.Time `json:"nextSyncTime,omitempty"`
 
@@ -246,27 +241,16 @@ type DatasourceStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
 }
 
-// Helper function to check if the datasource is ready.
-func (s *DatasourceStatus) IsReady() bool {
-	if meta.IsStatusConditionTrue(s.Conditions, DatasourceConditionError) {
-		return false
-	}
-	if meta.IsStatusConditionTrue(s.Conditions, DatasourceConditionWaiting) {
-		return false
-	}
-	return s.NumberOfObjects > 0
-}
-
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type"
 // +kubebuilder:printcolumn:name="Domain",type="string",JSONPath=".spec.schedulingDomain"
 // +kubebuilder:printcolumn:name="Created",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Synced",type="date",JSONPath=".status.lastSynced"
-// +kubebuilder:printcolumn:name="Took",type="string",JSONPath=".status.took"
 // +kubebuilder:printcolumn:name="Next",type="string",JSONPath=".status.nextSyncTime"
 // +kubebuilder:printcolumn:name="Objects",type="integer",JSONPath=".status.numberOfObjects"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 
 // Datasource is the Schema for the datasources API
 type Datasource struct {

api/v1alpha1/decision_types.go

@@ -71,15 +71,11 @@ type DecisionResult struct {
 }
 
 const (
-	// Something went wrong during the calculation of the decision.
-	DecisionConditionError = "Error"
+	// The decision was successfully processed.
+	DecisionConditionReady = "Ready"
 )
 
 type DecisionStatus struct {
-	// The time it took to schedule.
-	// +kubebuilder:validation:Optional
-	Took metav1.Duration `json:"took"`
-
 	// The result of this decision.
 	// +kubebuilder:validation:Optional
 	Result *DecisionResult `json:"result,omitempty"`
@@ -113,6 +109,7 @@ type DecisionStatus struct {
 // +kubebuilder:printcolumn:name="Took",type="string",JSONPath=".status.took"
 // +kubebuilder:printcolumn:name="Pipeline",type="string",JSONPath=".spec.pipelineRef.name"
 // +kubebuilder:printcolumn:name="TargetHost",type="string",JSONPath=".status.result.targetHost"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 // +kubebuilder:selectablefield:JSONPath=".spec.resourceID"
 
 // Decision is the Schema for the decisions API

api/v1alpha1/descheduling_types.go

@@ -36,28 +36,14 @@ type DeschedulingSpec struct {
 	Reason string `json:"reason,omitempty"`
 }
 
-// The phase in which the descheduling is.
-type DeschedulingStatusPhase string
-
 const (
-	// The descheduling was queued and is waiting to be processed.
-	DeschedulingStatusPhaseQueued DeschedulingStatusPhase = "queued"
+	// The descheduling was successfully processed.
+	DeschedulingConditionReady = "Ready"
 	// The descheduling is currently being processed.
-	DeschedulingStatusPhaseInProgress DeschedulingStatusPhase = "inProgress"
-	// The descheduling was completed successfully.
-	DeschedulingStatusPhaseCompleted DeschedulingStatusPhase = "completed"
-	// The descheduling failed.
-	DeschedulingStatusPhaseFailed DeschedulingStatusPhase = "failed"
-)
-
-const (
-	// Something went wrong during the descheduling process.
-	DeschedulingConditionError = "Error"
+	DeschedulingConditionInProgress = "InProgress"
 )
 
 type DeschedulingStatus struct {
-	// The current phase of the descheduling.
-	Phase DeschedulingStatusPhase `json:"phase"`
 	// The current status conditions of the descheduling.
 	// +kubebuilder:validation:Optional
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
@@ -70,11 +56,11 @@ type DeschedulingStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
-// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
 // +kubebuilder:printcolumn:name="Previous Host",type="string",JSONPath=".spec.prevHost"
 // +kubebuilder:printcolumn:name="New Host",type="string",JSONPath=".status.newHost"
 // +kubebuilder:printcolumn:name="Created",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Reason(s)",type="string",JSONPath=".spec.reason"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 
 // Descheduling is the Schema for the deschedulings API
 type Descheduling struct {

api/v1alpha1/knowledge_types.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
@@ -85,17 +84,14 @@ func BoxFeatureList[T any](features []T) (runtime.RawExtension, error) {
 }
 
 const (
-	// Something went wrong during the extraction of the knowledge.
-	KnowledgeConditionError = "Error"
+	// The knowledge is ready to be used.
+	KnowledgeConditionReady = "Ready"
 )
 
 type KnowledgeStatus struct {
 	// When the knowledge was last successfully extracted.
 	// +kubebuilder:validation:Optional
 	LastExtracted metav1.Time `json:"lastExtracted"`
-	// The time it took to perform the last extraction.
-	// +kubebuilder:validation:Optional
-	Took metav1.Duration `json:"took"`
 
 	// The raw data behind the extracted knowledge, e.g. a list of features.
 	// +kubebuilder:validation:Optional
@@ -109,23 +105,15 @@ type KnowledgeStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
 }
 
-// Helper function to check if the knowledge is ready.
-func (s *KnowledgeStatus) IsReady() bool {
-	if meta.IsStatusConditionTrue(s.Conditions, KnowledgeConditionError) {
-		return false
-	}
-	return s.RawLength > 0
-}
-
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:printcolumn:name="Domain",type="string",JSONPath=".spec.schedulingDomain"
 // +kubebuilder:printcolumn:name="Created",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Extracted",type="date",JSONPath=".status.lastExtracted"
-// +kubebuilder:printcolumn:name="Took",type="string",JSONPath=".status.took"
 // +kubebuilder:printcolumn:name="Recency",type="string",JSONPath=".spec.recency"
 // +kubebuilder:printcolumn:name="Features",type="integer",JSONPath=".status.rawLength"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 
 // Knowledge is the Schema for the knowledges API
 type Knowledge struct {

api/v1alpha1/kpi_types.go

@@ -43,14 +43,11 @@ type KPISpec struct {
 }
 
 const (
-	// Something went wrong during the kpi reconciliation.
-	KPIConditionError = "Error"
+	// If the kpi was successfully processed.
+	KPIConditionReady = "Ready"
 )
 
 type KPIStatus struct {
-	// If the kpi is ready to be executed.
-	Ready bool `json:"ready"`
-
 	// How many dependencies have been reconciled.
 	ReadyDependencies int `json:"readyDependencies"`
 	// Total number of dependencies configured.
@@ -71,6 +68,7 @@ type KPIStatus struct {
 // +kubebuilder:printcolumn:name="Domain",type="string",JSONPath=".spec.schedulingDomain"
 // +kubebuilder:printcolumn:name="Ready",type="boolean",JSONPath=".status.ready"
 // +kubebuilder:printcolumn:name="Dependencies",type="string",JSONPath=".status.dependenciesReadyFrac"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 
 // KPI is the Schema for the deschedulings API
 type KPI struct {

api/v1alpha1/pipeline_types.go

@@ -92,13 +92,11 @@ type PipelineSpec struct {
 }
 
 const (
-	// Something went wrong during the pipeline reconciliation.
-	PipelineConditionError = "Error"
+	// The pipeline is ready to be used.
+	PipelineConditionReady = "Ready"
 )
 
 type PipelineStatus struct {
-	// Whether the pipeline is ready to be used.
-	Ready bool `json:"ready"`
 	// The total number of steps configured in the pipeline.
 	TotalSteps int `json:"totalSteps"`
 	// The number of steps that are ready.
@@ -117,8 +115,8 @@ type PipelineStatus struct {
 // +kubebuilder:printcolumn:name="Created",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Domain",type="string",JSONPath=".spec.schedulingDomain"
 // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type"
-// +kubebuilder:printcolumn:name="Ready",type="boolean",JSONPath=".status.ready"
 // +kubebuilder:printcolumn:name="Steps",type="string",JSONPath=".status.stepsReadyFrac"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 
 // Pipeline is the Schema for the decisions API
 type Pipeline struct {

api/v1alpha1/zz_generated.deepcopy.go

@@ -27,15 +27,15 @@ spec:
     - jsonPath: .status.lastSynced
       name: Synced
       type: date
-    - jsonPath: .status.took
-      name: Took
-      type: string
     - jsonPath: .status.nextSyncTime
       name: Next
       type: string
     - jsonPath: .status.numberOfObjects
       name: Objects
       type: integer
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: Ready
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -347,11 +347,6 @@ spec:
                 description: The number of objects currently stored for this datasource.
                 format: int64
                 type: integer
-              took:
-                description: The time it took to perform the last sync.
-                type: string
-            required:
-            - took
             type: object
         required:
         - spec

config/crd/bases/cortex.cloud_datasources.yaml

@@ -39,6 +39,9 @@ spec:
     - jsonPath: .status.result.targetHost
       name: TargetHost
       type: string
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: Ready
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -392,9 +395,6 @@ spec:
                       the target host.
                     type: string
                 type: object
-              took:
-                description: The time it took to schedule.
-                type: string
             type: object
         required:
         - spec

config/crd/bases/cortex.cloud_decisions.yaml

@@ -15,9 +15,6 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.phase
-      name: Phase
-      type: string
     - jsonPath: .spec.prevHost
       name: Previous Host
       type: string
@@ -30,6 +27,9 @@ spec:
     - jsonPath: .spec.reason
       name: Reason(s)
       type: string
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: Ready
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -140,11 +140,6 @@ spec:
               newHostType:
                 description: The type of host where the VM was rescheduled to.
                 type: string
-              phase:
-                description: The current phase of the descheduling.
-                type: string
-            required:
-            - phase
             type: object
         required:
         - spec