Skip to content

Commit 6f3058f

Browse files
committed
fix .Error calls under .V wrapper
This is required as .V().Error actually ignores the logging level and will always log, which is not as intended. This is a new finding in recent k8s logcheck versions On-behalf-of: SAP <simon.bein@sap.com> Signed-off-by: Simon Bein <simontheleg@gmail.com>
1 parent 94f959a commit 6f3058f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func (d *logicalClusterResourcesDeleter) deleteCollection(ctx context.Context, c
174174
opts := metav1.DeleteOptions{PropagationPolicy: &background}
175175
if err := d.metadataClusterClient.Resource(gvr).Cluster(clusterName.Path()).DeleteCollection(
176176
ctx, opts, metav1.ListOptions{}); err != nil {
177-
logger.V(5).Error(err, "unexpected deleteCollection error")
177+
logger.V(5).Info("unexpected deleteCollection error", "err", err)
178178
return true, err
179179
}
180180

@@ -262,7 +262,7 @@ func (d *logicalClusterResourcesDeleter) deleteAllContentForGroupVersionResource
262262
// estimate how long it will take for the resource to be deleted (needed for objects that support graceful delete)
263263
estimate, err := d.estimateGracefulTermination(ctx, gvr, clusterName, clusterDeletedAt)
264264
if err != nil {
265-
logger.V(5).Error(err, "unable to estimate")
265+
logger.V(5).Info("unable to estimate", "err", err)
266266
return gvrDeletionMetadata{}, err
267267
}
268268
logger.V(5).Info("created estimate", "estimate", estimate)
@@ -286,7 +286,7 @@ func (d *logicalClusterResourcesDeleter) deleteAllContentForGroupVersionResource
286286
logger.V(5).Info("checking for no more items")
287287
unstructuredList, listSupported, err := d.listCollection(ctx, clusterName, gvr, verbs)
288288
if err != nil {
289-
logger.V(5).Error(err, "error verifying no items in logical cluster")
289+
logger.V(5).Info("error verifying no items in logical cluster", "err", err)
290290
return gvrDeletionMetadata{finalizerEstimateSeconds: estimate}, err
291291
}
292292
if !listSupported {
@@ -453,7 +453,7 @@ func (d *logicalClusterResourcesDeleter) deleteAllContent(ctx context.Context, w
453453
"%s",
454454
message,
455455
)
456-
logger.V(4).Error(utilerrors.NewAggregate(errs), "resource remaining")
456+
logger.V(4).Info("resource remaining", "err", utilerrors.NewAggregate(errs))
457457
return estimate, message, utilerrors.NewAggregate(errs)
458458
}
459459

pkg/reconciler/core/logicalclusterdeletion/logicalcluster_deletion_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (c *Controller) processNextWorkItem(ctx context.Context) bool {
216216
if errors.As(err, &estimate) {
217217
t := estimate.Estimate/2 + 1
218218
duration := time.Duration(t) * time.Second
219-
logger.V(2).Error(err, "content remaining in logical cluster after a wait, waiting more to continue", "duration", time.Since(startTime), "waiting", duration)
219+
logger.V(2).Info("content remaining in logical cluster after a wait, waiting more to continue", "duration", time.Since(startTime), "waiting", duration, "err", err)
220220

221221
c.queue.AddAfter(key, duration)
222222
} else {

0 commit comments

Comments
 (0)