Skip to content

Commit cd0f030

Browse files
t-perssont-persson
committed
Remove duplicate reasons
There's no need to have multiple names for completed
1 parent e4ee018 commit cd0f030

File tree

8 files changed

+16
-27
lines changed

8 files changed

+16
-27
lines changed

‎api/v1alpha1/provider_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ type ProviderStatus struct {
123123

124124
// Provider is the Schema for the providers API
125125
// +kubebuilder:printcolumn:name="Available",type="string",JSONPath=".status.conditions[?(@.type==\"Available\")].status"
126-
// +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type==\"Available\")].reason"
127126
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[?(@.type==\"Available\")].message"
128127
type Provider struct {
129128
metav1.TypeMeta `json:",inline"`

‎config/crd/bases/etos.eiffel-community.github.io_providers.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ spec:
1818
- jsonPath: .status.conditions[?(@.type=="Available")].status
1919
name: Available
2020
type: string
21-
- jsonPath: .status.conditions[?(@.type=="Available")].reason
22-
name: Reason
23-
type: string
2421
- jsonPath: .status.conditions[?(@.type=="Available")].message
2522
name: Message
2623
type: string

‎internal/controller/cluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
143143
// update will set the status condition and update the status of the ETOS cluster.
144144
// if the update fails due to conflict the reconciliation will requeue after one second.
145145
func (r *ClusterReconciler) update(ctx context.Context, cluster *etosv1alpha1.Cluster, clusterStatus metav1.ConditionStatus, message string) (ctrl.Result, error) {
146-
if meta.SetStatusCondition(&cluster.Status.Conditions, metav1.Condition{Type: status.StatusReady, Status: clusterStatus, Reason: status.ReasonReady, Message: message}) {
146+
if meta.SetStatusCondition(&cluster.Status.Conditions, metav1.Condition{Type: status.StatusReady, Status: clusterStatus, Reason: status.ReasonCompleted, Message: message}) {
147147
if err := r.Status().Update(ctx, cluster); err != nil {
148148
if apierrors.IsConflict(err) {
149149
return ctrl.Result{RequeueAfter: time.Second}, nil

‎internal/controller/environment_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func (r *EnvironmentReconciler) reconcile(ctx context.Context, environment *etos
165165
metav1.Condition{
166166
Type: status.StatusActive,
167167
Status: metav1.ConditionFalse,
168-
Reason: status.ReasonRunning,
168+
Reason: status.ReasonActive,
169169
Message: "Job is running",
170170
}) {
171171
return r.Status().Update(ctx, environment)

‎internal/controller/environmentrequest_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (r *EnvironmentRequestReconciler) reconcileEnvironmentProvider(ctx context.
183183
condition = metav1.Condition{
184184
Type: status.StatusReady,
185185
Status: metav1.ConditionTrue,
186-
Reason: status.ReasonDone,
186+
Reason: status.ReasonCompleted,
187187
Message: result.Description,
188188
}
189189
}
@@ -197,7 +197,7 @@ func (r *EnvironmentRequestReconciler) reconcileEnvironmentProvider(ctx context.
197197
metav1.Condition{
198198
Type: status.StatusReady,
199199
Status: metav1.ConditionFalse,
200-
Reason: status.ReasonRunning,
200+
Reason: status.ReasonActive,
201201
Message: "Environment provider is running",
202202
}) {
203203
return r.Status().Update(ctx, environmentrequest)

‎internal/controller/provider_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
8686
metav1.Condition{
8787
Type: status.StatusAvailable,
8888
Status: metav1.ConditionFalse,
89-
Reason: status.ReasonError,
89+
Reason: status.ReasonFailed,
9090
Message: "Could not communicate with host",
9191
})
9292
if err = r.Status().Update(ctx, provider); err != nil {
@@ -101,7 +101,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
101101
metav1.Condition{
102102
Type: status.StatusAvailable,
103103
Status: metav1.ConditionFalse,
104-
Reason: status.ReasonError,
104+
Reason: status.ReasonFailed,
105105
Message: fmt.Sprintf("Wrong status code (%d) from health check endpoint", resp.StatusCode),
106106
})
107107
if err = r.Status().Update(ctx, provider); err != nil {
@@ -116,7 +116,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
116116
metav1.Condition{
117117
Type: status.StatusAvailable,
118118
Status: metav1.ConditionTrue,
119-
Reason: status.ReasonOk,
119+
Reason: status.ReasonActive,
120120
Message: "Provider is up and running",
121121
})
122122
if err = r.Status().Update(ctx, provider); err != nil {

‎internal/controller/status/status.go‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,9 @@ const (
2424
StatusSuiteRunner = "SuiteRunner"
2525
)
2626

27-
// There are many duplicates here, will clean up later.
2827
const (
29-
ReasonCompleted = "Completed"
30-
ReasonDone = "Done"
31-
ReasonOk = "OK"
32-
ReasonSuccessful = "Successful"
33-
ReasonReady = "Ready"
34-
ReasonFailed = "Failed"
35-
ReasonError = "Error"
36-
ReasonRunning = "Running"
37-
ReasonActive = "Active"
38-
ReasonPending = "Pending"
28+
ReasonPending = "Pending"
29+
ReasonActive = "Active"
30+
ReasonFailed = "Failed"
31+
ReasonCompleted = "Completed"
3932
)

‎internal/controller/testrun_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (r *TestRunReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
114114
if testrun.Status.CompletionTime != nil {
115115
testrunCondition := meta.FindStatusCondition(testrun.Status.Conditions, status.StatusActive)
116116
var retention *metav1.Duration
117-
if testrunCondition.Reason == "Successful" {
117+
if testrunCondition.Reason == status.ReasonCompleted {
118118
retention = testrun.Spec.Retention.Success
119119
} else {
120120
retention = testrun.Spec.Retention.Failure
@@ -234,7 +234,7 @@ func (r *TestRunReconciler) reconcileActiveStatus(ctx context.Context, testrun *
234234
metav1.Condition{
235235
Type: status.StatusActive,
236236
Status: metav1.ConditionFalse,
237-
Reason: status.ReasonSuccessful,
237+
Reason: status.ReasonCompleted,
238238
Message: "Suite runners finished successfully",
239239
}) {
240240
now := metav1.Now()
@@ -305,7 +305,7 @@ func (r *TestRunReconciler) reconcileSuiteRunner(ctx context.Context, testrun *e
305305
condition = metav1.Condition{
306306
Type: status.StatusSuiteRunner,
307307
Status: metav1.ConditionFalse,
308-
Reason: status.ReasonDone,
308+
Reason: status.ReasonCompleted,
309309
Message: result.Description,
310310
}
311311
}
@@ -320,7 +320,7 @@ func (r *TestRunReconciler) reconcileSuiteRunner(ctx context.Context, testrun *e
320320
metav1.Condition{
321321
Type: status.StatusSuiteRunner,
322322
Status: metav1.ConditionFalse,
323-
Reason: status.ReasonRunning,
323+
Reason: status.ReasonActive,
324324
Message: "Job is running",
325325
}) {
326326
return r.Status().Update(ctx, testrun)
@@ -464,7 +464,7 @@ func (r *TestRunReconciler) checkEnvironment(ctx context.Context, testrun *etosv
464464
metav1.Condition{
465465
Type: status.StatusEnvironment,
466466
Status: metav1.ConditionTrue,
467-
Reason: status.ReasonReady,
467+
Reason: status.ReasonCompleted,
468468
Message: "Environment ready",
469469
}) {
470470
return r.Status().Update(ctx, testrun)

0 commit comments

Comments
 (0)