diff --git a/api/v1alpha1/provider_types.go b/api/v1alpha1/provider_types.go index 8d8738e..9299f05 100644 --- a/api/v1alpha1/provider_types.go +++ b/api/v1alpha1/provider_types.go @@ -123,7 +123,6 @@ type ProviderStatus struct { // Provider is the Schema for the providers API // +kubebuilder:printcolumn:name="Available",type="string",JSONPath=".status.conditions[?(@.type==\"Available\")].status" -// +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type==\"Available\")].reason" // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[?(@.type==\"Available\")].message" type Provider struct { metav1.TypeMeta `json:",inline"` diff --git a/config/crd/bases/etos.eiffel-community.github.io_providers.yaml b/config/crd/bases/etos.eiffel-community.github.io_providers.yaml index 701d1ab..a0ba82d 100644 --- a/config/crd/bases/etos.eiffel-community.github.io_providers.yaml +++ b/config/crd/bases/etos.eiffel-community.github.io_providers.yaml @@ -18,9 +18,6 @@ spec: - jsonPath: .status.conditions[?(@.type=="Available")].status name: Available type: string - - jsonPath: .status.conditions[?(@.type=="Available")].reason - name: Reason - type: string - jsonPath: .status.conditions[?(@.type=="Available")].message name: Message type: string diff --git a/config/samples/etos_v1alpha1_cluster.yaml b/config/samples/etos_v1alpha1_cluster.yaml index bd82641..130e673 100644 --- a/config/samples/etos_v1alpha1_cluster.yaml +++ b/config/samples/etos_v1alpha1_cluster.yaml @@ -22,10 +22,10 @@ spec: environmentProvider: image: ghcr.io/eiffel-community/etos-environment-provider:b7590430 suiteRunner: - image: ghcr.io/eiffel-community/etos-suite-runner:c85d419e + image: ghcr.io/eiffel-community/etos-suite-runner:3c5575fd logListener: etosQueueName: "*.testlog" - image: ghcr.io/eiffel-community/etos-log-listener:c85d419e + image: ghcr.io/eiffel-community/etos-log-listener:3c5575fd suiteStarter: image: ghcr.io/eiffel-community/etos-suite-starter:76543433 eiffelQueueName: etos-suite-starter diff --git a/internal/controller/cluster_controller.go b/internal/controller/cluster_controller.go index 2b5f697..546fb62 100644 --- a/internal/controller/cluster_controller.go +++ b/internal/controller/cluster_controller.go @@ -143,7 +143,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct // update will set the status condition and update the status of the ETOS cluster. // if the update fails due to conflict the reconciliation will requeue after one second. func (r *ClusterReconciler) update(ctx context.Context, cluster *etosv1alpha1.Cluster, clusterStatus metav1.ConditionStatus, message string) (ctrl.Result, error) { - if meta.SetStatusCondition(&cluster.Status.Conditions, metav1.Condition{Type: status.StatusReady, Status: clusterStatus, Reason: status.ReasonReady, Message: message}) { + if meta.SetStatusCondition(&cluster.Status.Conditions, metav1.Condition{Type: status.StatusReady, Status: clusterStatus, Reason: status.ReasonCompleted, Message: message}) { if err := r.Status().Update(ctx, cluster); err != nil { if apierrors.IsConflict(err) { return ctrl.Result{RequeueAfter: time.Second}, nil diff --git a/internal/controller/environment_controller.go b/internal/controller/environment_controller.go index 5a1c207..52f4072 100644 --- a/internal/controller/environment_controller.go +++ b/internal/controller/environment_controller.go @@ -165,7 +165,7 @@ func (r *EnvironmentReconciler) reconcile(ctx context.Context, environment *etos metav1.Condition{ Type: status.StatusActive, Status: metav1.ConditionFalse, - Reason: status.ReasonRunning, + Reason: status.ReasonActive, Message: "Job is running", }) { return r.Status().Update(ctx, environment) diff --git a/internal/controller/environmentrequest_controller.go b/internal/controller/environmentrequest_controller.go index 8f43c0c..6835a1d 100644 --- a/internal/controller/environmentrequest_controller.go +++ b/internal/controller/environmentrequest_controller.go @@ -183,7 +183,7 @@ func (r *EnvironmentRequestReconciler) reconcileEnvironmentProvider(ctx context. condition = metav1.Condition{ Type: status.StatusReady, Status: metav1.ConditionTrue, - Reason: status.ReasonDone, + Reason: status.ReasonCompleted, Message: result.Description, } } @@ -197,7 +197,7 @@ func (r *EnvironmentRequestReconciler) reconcileEnvironmentProvider(ctx context. metav1.Condition{ Type: status.StatusReady, Status: metav1.ConditionFalse, - Reason: status.ReasonRunning, + Reason: status.ReasonActive, Message: "Environment provider is running", }) { return r.Status().Update(ctx, environmentrequest) diff --git a/internal/controller/provider_controller.go b/internal/controller/provider_controller.go index cbcb0e1..162f3cd 100644 --- a/internal/controller/provider_controller.go +++ b/internal/controller/provider_controller.go @@ -86,7 +86,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c metav1.Condition{ Type: status.StatusAvailable, Status: metav1.ConditionFalse, - Reason: status.ReasonError, + Reason: status.ReasonFailed, Message: "Could not communicate with host", }) if err = r.Status().Update(ctx, provider); err != nil { @@ -101,7 +101,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c metav1.Condition{ Type: status.StatusAvailable, Status: metav1.ConditionFalse, - Reason: status.ReasonError, + Reason: status.ReasonFailed, Message: fmt.Sprintf("Wrong status code (%d) from health check endpoint", resp.StatusCode), }) if err = r.Status().Update(ctx, provider); err != nil { @@ -116,7 +116,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c metav1.Condition{ Type: status.StatusAvailable, Status: metav1.ConditionTrue, - Reason: status.ReasonOk, + Reason: status.ReasonActive, Message: "Provider is up and running", }) if err = r.Status().Update(ctx, provider); err != nil { diff --git a/internal/controller/status/status.go b/internal/controller/status/status.go index 253e842..c544017 100644 --- a/internal/controller/status/status.go +++ b/internal/controller/status/status.go @@ -24,16 +24,9 @@ const ( StatusSuiteRunner = "SuiteRunner" ) -// There are many duplicates here, will clean up later. const ( - ReasonCompleted = "Completed" - ReasonDone = "Done" - ReasonOk = "OK" - ReasonSuccessful = "Successful" - ReasonReady = "Ready" - ReasonFailed = "Failed" - ReasonError = "Error" - ReasonRunning = "Running" - ReasonActive = "Active" - ReasonPending = "Pending" + ReasonPending = "Pending" + ReasonActive = "Active" + ReasonFailed = "Failed" + ReasonCompleted = "Completed" ) diff --git a/internal/controller/testrun_controller.go b/internal/controller/testrun_controller.go index 67ed54c..c98a06d 100644 --- a/internal/controller/testrun_controller.go +++ b/internal/controller/testrun_controller.go @@ -114,7 +114,7 @@ func (r *TestRunReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct if testrun.Status.CompletionTime != nil { testrunCondition := meta.FindStatusCondition(testrun.Status.Conditions, status.StatusActive) var retention *metav1.Duration - if testrunCondition.Reason == "Successful" { + if testrunCondition.Reason == status.ReasonCompleted { retention = testrun.Spec.Retention.Success } else { retention = testrun.Spec.Retention.Failure @@ -234,7 +234,7 @@ func (r *TestRunReconciler) reconcileActiveStatus(ctx context.Context, testrun * metav1.Condition{ Type: status.StatusActive, Status: metav1.ConditionFalse, - Reason: status.ReasonSuccessful, + Reason: status.ReasonCompleted, Message: "Suite runners finished successfully", }) { now := metav1.Now() @@ -305,7 +305,7 @@ func (r *TestRunReconciler) reconcileSuiteRunner(ctx context.Context, testrun *e condition = metav1.Condition{ Type: status.StatusSuiteRunner, Status: metav1.ConditionFalse, - Reason: status.ReasonDone, + Reason: status.ReasonCompleted, Message: result.Description, } } @@ -320,7 +320,7 @@ func (r *TestRunReconciler) reconcileSuiteRunner(ctx context.Context, testrun *e metav1.Condition{ Type: status.StatusSuiteRunner, Status: metav1.ConditionFalse, - Reason: status.ReasonRunning, + Reason: status.ReasonActive, Message: "Job is running", }) { return r.Status().Update(ctx, testrun) @@ -464,7 +464,7 @@ func (r *TestRunReconciler) checkEnvironment(ctx context.Context, testrun *etosv metav1.Condition{ Type: status.StatusEnvironment, Status: metav1.ConditionTrue, - Reason: status.ReasonReady, + Reason: status.ReasonCompleted, Message: "Environment ready", }) { return r.Status().Update(ctx, testrun)