Skip to content

Commit 19f104f

Browse files
committed
Back out explicit requeue
1 parent 8e0f65c commit 19f104f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

pkg/controller/directimagemigration/directimagemigration_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ func (r *ReconcileDirectImageMigration) Reconcile(request reconcile.Request) (re
118118
if errors.IsNotFound(err) {
119119
// Object not found, return. Created objects are automatically garbage collected.
120120
// For additional cleanup logic use finalizers.
121-
return reconcile.Result{Requeue: false}, nil
121+
return reconcile.Result{}, nil
122122
}
123123
// Error reading the object - requeue the request.
124124
return reconcile.Result{Requeue: true}, err
125125
}
126126

127127
// Completed.
128128
if imageMigration.Status.Phase == Completed {
129-
return reconcile.Result{Requeue: false}, nil
129+
return reconcile.Result{}, nil
130130
}
131131

132132
// Begin staging conditions

pkg/controller/directimagestreammigration/directimagestreammigration_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ func (r *ReconcileDirectImageStreamMigration) Reconcile(request reconcile.Reques
109109
if errors.IsNotFound(err) {
110110
// Object not found, return. Created objects are automatically garbage collected.
111111
// For additional cleanup logic use finalizers.
112-
return reconcile.Result{Requeue: false}, nil
112+
return reconcile.Result{}, nil
113113
}
114114
// Error reading the object - requeue the request.
115115
return reconcile.Result{Requeue: true}, err
116116
}
117117

118118
// Completed.
119119
if imageStreamMigration.Status.Phase == Completed {
120-
return reconcile.Result{Requeue: false}, nil
120+
return reconcile.Result{}, nil
121121
}
122122

123123
// Begin staging conditions
@@ -163,5 +163,5 @@ func (r *ReconcileDirectImageStreamMigration) Reconcile(request reconcile.Reques
163163
return reconcile.Result{RequeueAfter: requeueAfter}, nil
164164
}
165165

166-
return reconcile.Result{Requeue: false}, nil
166+
return reconcile.Result{}, nil
167167
}

pkg/controller/directvolumemigration/directvolumemigration_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (r *ReconcileDirectVolumeMigration) Reconcile(request reconcile.Request) (r
9999
if errors.IsNotFound(err) {
100100
// Object not found, return. Created objects are automatically garbage collected.
101101
// For additional cleanup logic use finalizers.
102-
return reconcile.Result{Requeue: false}, nil
102+
return reconcile.Result{}, nil
103103
}
104104
// Error reading the object - requeue the request.
105105
return reconcile.Result{Requeue: true}, err
@@ -110,7 +110,7 @@ func (r *ReconcileDirectVolumeMigration) Reconcile(request reconcile.Request) (r
110110

111111
// Check if completed
112112
if direct.Status.Phase == Completed {
113-
return reconcile.Result{Requeue: false}, nil
113+
return reconcile.Result{}, nil
114114
}
115115

116116
// Begin staging conditions

pkg/controller/migmigration/migmigration_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (r *ReconcileMigMigration) Reconcile(request reconcile.Request) (reconcile.
155155
if err != nil {
156156
if errors.IsNotFound(err) {
157157
err = r.deleted()
158-
return reconcile.Result{Requeue: false}, nil
158+
return reconcile.Result{}, nil
159159
}
160160
log.Info("Error getting migmigration for reconcile, requeueing.")
161161
log.Trace(err)

0 commit comments

Comments
 (0)