@@ -128,9 +128,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
128
128
err := ctrl .NewControllerManagedBy (mgr ).Named ("cnsunregistervolume-controller" ).
129
129
For (& v1a1.CnsUnregisterVolume {}).
130
130
WithEventFilter (predicate.GenerationChangedPredicate {}).
131
- WithOptions (controller.Options {
132
- MaxConcurrentReconciles : maxWorkerThreads },
133
- ).
131
+ WithOptions (controller.Options {MaxConcurrentReconciles : maxWorkerThreads }).
134
132
Complete (r )
135
133
if err != nil {
136
134
log .Errorf ("Failed to build application controller. Err: %v" , err )
@@ -164,8 +162,6 @@ var (
164
162
removeFinalizerFromPVC = k8s .RemoveFinalizerFromPVC
165
163
)
166
164
167
- // TODO: find a way to optimise the logger usage in this file.
168
-
169
165
// Reconcile reads that state of the cluster for a Reconciler object
170
166
// and makes changes based on the state read and what is in the
171
167
// Reconciler.Spec.
@@ -207,13 +203,15 @@ func (r *Reconciler) Reconcile(ctx context.Context,
207
203
err = r .reconcileDelete (ctx , * instance , request )
208
204
if err != nil {
209
205
log .Error ("failed to reconcile with error " , err )
206
+ setInstanceError (ctx , r , instance , err .Error ())
210
207
return reconcile.Result {RequeueAfter : backoff }, nil
211
208
}
212
209
213
210
log .Info ("removing finalizer and allowing deletion of the instance" )
214
211
err := removeFinalizer (ctx , r .client , instance )
215
212
if err != nil {
216
213
log .Error ("failed to remove finalizer from the instance with error " , err )
214
+ setInstanceError (ctx , r , instance , "failed to remove finalizer from the instance" )
217
215
return reconcile.Result {RequeueAfter : backoff }, nil
218
216
}
219
217
@@ -228,7 +226,7 @@ func (r *Reconciler) Reconcile(ctx context.Context,
228
226
return reconcile.Result {}, nil
229
227
}
230
228
231
- err = r .reconcile (ctx , instance , request )
229
+ err = r .reconcile (ctx , * instance , request )
232
230
if err != nil {
233
231
log .Error ("failed to reconcile with error " , err )
234
232
setInstanceError (ctx , r , instance , err .Error ())
@@ -249,18 +247,18 @@ func (r *Reconciler) Reconcile(ctx context.Context,
249
247
}
250
248
251
249
func (r * Reconciler ) reconcile (ctx context.Context ,
252
- instance * v1a1.CnsUnregisterVolume , request reconcile.Request ) error {
250
+ instance v1a1.CnsUnregisterVolume , request reconcile.Request ) error {
253
251
log := logger .GetLogger (ctx ).With ("name" , request .NamespacedName )
254
252
255
- params , err := getValidatedParams (ctx , * instance )
253
+ params , err := getValidatedParams (ctx , instance )
256
254
if err != nil {
257
255
log .Error ("invalid input parameters" , err )
258
256
return err
259
257
}
260
258
261
259
// Only protect the instance if input parameters are valid.
262
260
// This ensures faster deletion of instances with invalid parameters.
263
- err = protectInstance (ctx , r .client , instance )
261
+ err = protectInstance (ctx , r .client , & instance )
264
262
if err != nil {
265
263
log .Error ("failed to protect instance with error " , err )
266
264
return err
@@ -307,12 +305,11 @@ func (r *Reconciler) reconcileDelete(ctx context.Context,
307
305
if err != nil {
308
306
// If input parameters are invalid, the instance can be deleted
309
307
// since the volume cannot be unregistered.
310
- log .Info ("invalid input parameters" )
308
+ log .Info ("invalid input parameters " , instance . Spec )
311
309
return nil
312
310
}
313
311
314
- usageInfo , err := getVolumeUsageInfo (ctx , params .pvcName , params .namespace ,
315
- instance .Spec .ForceUnregister )
312
+ usageInfo , err := getVolumeUsageInfo (ctx , params .pvcName , params .namespace , params .force )
316
313
if err != nil {
317
314
log .Error ("failed to get volume usage info with error " , err )
318
315
return err
@@ -339,7 +336,9 @@ func (r *Reconciler) reconcileDelete(ctx context.Context,
339
336
return nil
340
337
}
341
338
342
- func unregisterVolume (ctx context.Context , volMgr volumes.Manager ,
339
+ var unregisterVolume = _unregisterVolume
340
+
341
+ func _unregisterVolume (ctx context.Context , volMgr volumes.Manager ,
343
342
request reconcile.Request , params params ) error {
344
343
log := logger .GetLogger (ctx ).With ("name" , request .NamespacedName )
345
344
0 commit comments