Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: csi-addons/kubernetes-csi-addons
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 779f0f79feec188ef1c24e8ee8a4bc6d021d5adf
Choose a base ref
..
head repository: csi-addons/kubernetes-csi-addons
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a573bf69054acc14b18f07f9eb96f9691d4104a
Choose a head ref
Showing with 4 additions and 2 deletions.
  1. +4 −2 controllers/csiaddons/persistentvolumeclaim_controller.go
6 changes: 4 additions & 2 deletions controllers/csiaddons/persistentvolumeclaim_controller.go
View file
Original file line number Diff line number Diff line change
@@ -139,7 +139,9 @@ func (r *PersistentVolumeClaimReconciler) Reconcile(ctx context.Context, req ctr
return ctrl.Result{}, err
}
schedule, scheduleFound = getScheduleFromAnnotation(&logger, ns.Annotations)
// If the schedule is found check driver supports the space reclamation.
// If the schedule is not found, check whether driver supports the
// space reclamation using annotation on namespace and registered driver
// capability for decision on requeue.
if !scheduleFound {
requeue, supportReclaimspace := r.checkDriverSupportReclaimsSpace(&logger, ns.Annotations, pv.Spec.CSI.Driver)
if !supportReclaimspace {
@@ -249,7 +251,7 @@ func (r *PersistentVolumeClaimReconciler) checkDriverSupportReclaimsSpace(logger

ok := r.supportsReclaimSpace(driver)
if reclaimSpaceSupportedByDriver && !ok {
logger.Info("Driver does not support spacereclamation, Reqeueing request", "DriverName", driver)
logger.Info("Driver supports spacereclamation but driver is not registered in the connection pool, Reqeueing request", "DriverName", driver)
return true, false
}