Skip to content

Remove duplicate statuses #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
Merged

Remove duplicate statuses #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95186c4
Remove duplicate reasons
t-persson Nov 3, 2025
86f97be
Update to the supported ESR version
t-persson Nov 6, 2025
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
1 change: 0 additions & 1 deletion api/v1alpha1/provider_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
3 changes: 0 additions & 3 deletions config/crd/bases/etos.eiffel-community.github.io_providers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/samples/etos_v1alpha1_cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/environment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/environmentrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/provider_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
15 changes: 4 additions & 11 deletions internal/controller/status/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
10 changes: 5 additions & 5 deletions internal/controller/testrun_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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,
}
}
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down