public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing issue about pv with policyClaim delete not being removed

This commit is contained in:
juanjo 2024-02-28 00:13:55 +01:00
parent 7da2d7f96a
commit 9f31224319
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
controllers/actions.summerwind.net/sync_volumes.go
View File

@ -150,7 +150,7 @@ func syncPV(ctx context.Context, c client.Client, log logr.Logger, ns string, pv
log.V(2).Info("Reconciling PV") log.V(2).Info("Reconciling PV")
if pv.Labels[labelKeyCleanup] == "" { if pv.Labels[labelKeyCleanup] == "" {
// We assume that the pvc is shortly terminated, hence retry forever until it gets removed. // We assume that the PVC is shortly terminated, hence retry forever until it gets removed.
retry := 10 * time.Second retry := 10 * time.Second
log.V(2).Info("Retrying sync to see if this PV needs to be managed by ARC", "requeueAfter", retry) log.V(2).Info("Retrying sync to see if this PV needs to be managed by ARC", "requeueAfter", retry)
return &ctrl.Result{RequeueAfter: retry}, nil return &ctrl.Result{RequeueAfter: retry}, nil
@ -159,27 +159,31 @@ func syncPV(ctx context.Context, c client.Client, log logr.Logger, ns string, pv
log.V(2).Info("checking pv phase", "phase", pv.Status.Phase) log.V(2).Info("checking pv phase", "phase", pv.Status.Phase)
if pv.Status.Phase != corev1.VolumeReleased { if pv.Status.Phase != corev1.VolumeReleased {
// We assume that the pvc is shortly terminated, hence retry forever until it gets removed. // We assume that the PVC is shortly terminated, hence retry forever until it gets removed.
retry := 10 * time.Second retry := 10 * time.Second
log.V(1).Info("Retrying sync until pvc gets released", "requeueAfter", retry) log.V(1).Info("Retrying sync until PVC gets released", "requeueAfter", retry)
return &ctrl.Result{RequeueAfter: retry}, nil return &ctrl.Result{RequeueAfter: retry}, nil
} }
// At this point, the PV is still Released // Check if the PV has ReclaimPolicy "Delete".
if pv.Spec.PersistentVolumeReclaimPolicy == corev1.PersistentVolumeReclaimDelete {
pvCopy := pv.DeepCopy() log.Info("Skipping manipulation for PV with 'Delete' reclaim policy", "pv", pv.Name)
delete(pvCopy.Labels, labelKeyCleanup) // For PVs with ReclaimPolicy "Delete", we don't need to do anything.
pvCopy.Spec.ClaimRef = nil return nil, nil
log.V(2).Info("Unsetting PV's claimRef", "pv", pv.Name)
if err := c.Update(ctx, pvCopy); err != nil {
return nil, err
} }
log.Info("PV should be Available now") // If ReclaimPolicy is not "Delete", we proceed to clean up the ClaimRef.
if pv.Status.Phase == corev1.VolumeReleased {
pvCopy := pv.DeepCopy()
delete(pvCopy.Labels, labelKeyCleanup)
pvCopy.Spec.ClaimRef = nil
log.V(2).Info("Unsetting PV's claimRef", "pv", pv.Name)
if err := c.Update(ctx, pvCopy); err != nil {
return nil, err
}
// At this point, the PV becomes Available, if it's reclaim policy is "Retain". log.Info("PV should be Available now")
// I have not yet tested it with "Delete" but perhaps it's deleted automatically after the update? }
// https://kubernetes.io/docs/concepts/storage/persistent-volumes/#retain
return nil, nil return nil, nil
} }