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

Fix confusing logs from pv and pvc controllers (#1487) 

Ref https://github.com/actions-runner-controller/actions-runner-controller/issues/1321#issuecomment-1137431212
This commit is contained in:
Yusuke Kuoka 2022-05-26 18:21:23 +09:00 committed by GitHub
parent 18bfb28c0b
commit 9dd26168d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/persistent_volume_claim_controller.go
View File

@ -50,8 +50,6 @@ func (r *RunnerPersistentVolumeClaimReconciler) Reconcile(ctx context.Context, r
return ctrl.Result{}, client.IgnoreNotFound(err)
}
log.Info("Reconciling runner pvc")
res, err := syncPVC(ctx, r.Client, log, req.Namespace, &pvc)
if res == nil {

20
controllers/sync_volumes.go
View File

@ -73,6 +73,8 @@ func syncPVC(ctx context.Context, c client.Client, log logr.Logger, ns string, p
return nil, nil
}
log.V(2).Info("Reconciling runner PVC")
var sts appsv1.StatefulSet
if err := c.Get(ctx, types.NamespacedName{Namespace: ns, Name: stsName}, &sts); err != nil {
if !kerrors.IsNotFound(err) {
@ -85,7 +87,7 @@ func syncPVC(ctx context.Context, c client.Client, log logr.Logger, ns string, p
return &ctrl.Result{RequeueAfter: retry}, nil
}
log = log.WithValues("pvc", pvc.Name, "sts", stsName)
log = log.WithValues("sts", stsName)
pvName := pvc.Spec.VolumeName
@ -108,7 +110,7 @@ func syncPVC(ctx context.Context, c client.Client, log logr.Logger, ns string, p
}
pvCopy.Labels[labelKeyCleanup] = stsName
log.Info("Scheduling to unset PV's claimRef", "pv", pv.Name)
log.V(2).Info("Scheduling to unset PV's claimRef", "pv", pv.Name)
// Apparently K8s doesn't reconcile PV immediately after PVC deletion.
// So we start a relatively busy loop of PV reconcilation slightly before the PVC deletion,
@ -117,14 +119,18 @@ func syncPVC(ctx context.Context, c client.Client, log logr.Logger, ns string, p
return nil, err
}
log.Info("Updated PV to unset claimRef")
// At this point, the PV is still Bound
log.Info("Deleting unused pvc")
log.V(2).Info("Deleting unused PVC")
if err := c.Delete(ctx, pvc); err != nil {
return nil, err
}
log.Info("Deleted unused PVC")
// At this point, the PV is still "Bound", but we are ready to unset pv.spec.claimRef in pv controller.
// Once the pv controller unsets claimRef, the PV becomes "Released", hence available for reuse by another eligible PVC.
}
@ -133,13 +139,11 @@ func syncPVC(ctx context.Context, c client.Client, log logr.Logger, ns string, p
}
func syncPV(ctx context.Context, c client.Client, log logr.Logger, ns string, pv *corev1.PersistentVolume) (*ctrl.Result, error) {
log.V(2).Info("checking pv claimRef")
if pv.Spec.ClaimRef == nil {
return nil, nil
}
log.V(2).Info("checking labels")
log.V(2).Info("Reconciling PV")
if pv.Labels[labelKeyCleanup] == "" {
// We assume that the pvc is shortly terminated, hence retry forever until it gets removed.
@ -162,11 +166,13 @@ func syncPV(ctx context.Context, c client.Client, log logr.Logger, ns string, pv
pvCopy := pv.DeepCopy()
delete(pvCopy.Labels, labelKeyCleanup)
pvCopy.Spec.ClaimRef = nil
log.Info("Unsetting PV's claimRef", "pv", pv.Name)
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")
// At this point, the PV becomes Available, if it's reclaim policy is "Retain".
// 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