Skip to content

chore(dataprotection): leave PVC bound status to Kubernetes #10780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leon-ape merged 2 commits into from
Aug 14, 2026
Merged

chore(dataprotection): leave PVC bound status to Kubernetes #10780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d27019
fix: leave PVC bound status to Kubernetes
leon-ape Aug 14, 2026
b4c6ecf
Merge remote-tracking branch 'origin/main' into bugfix/10755-stop-syn…
leon-ape Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions controllers/dataprotection/volumepopulator_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,9 +1030,6 @@ func (r *VolumePopulatorReconciler) completeBoundPVCIfNeeded(reqCtx intctrlutil.
return err
}
}
if err := r.syncTargetPVCBoundStatusIfReady(reqCtx, pvc); err != nil {
return err
}
postReadyCompleted, err := r.ensurePostReadyRestoreCompleted(reqCtx, pvc, restoreCtx)
if err != nil {
return err
Expand Down Expand Up @@ -1848,48 +1845,6 @@ func (r *VolumePopulatorReconciler) bindTargetPVCToPV(reqCtx intctrlutil.Request
return r.Client.Patch(reqCtx.Ctx, pvc, patch)
}

func pvClaimRefMatchesPVC(claimRef *corev1.ObjectReference, pvc *corev1.PersistentVolumeClaim) bool {
return claimRef != nil &&
claimRef.Name == pvc.Name &&
claimRef.Namespace == pvc.Namespace &&
claimRef.UID == pvc.UID
}

func (r *VolumePopulatorReconciler) syncTargetPVCBoundStatusIfReady(reqCtx intctrlutil.RequestCtx,
pvc *corev1.PersistentVolumeClaim) error {
if pvc.Spec.VolumeName == "" {
return nil
}
pv := &corev1.PersistentVolume{}
if err := r.Client.Get(reqCtx.Ctx, types.NamespacedName{Name: pvc.Spec.VolumeName}, pv); err != nil {
if apierrors.IsNotFound(err) {
return nil
}
return err
}
if !pvClaimRefMatchesPVC(pv.Spec.ClaimRef, pvc) {
return nil
}
return r.syncTargetPVCBoundStatus(reqCtx, pvc, pv)
}

func (r *VolumePopulatorReconciler) syncTargetPVCBoundStatus(reqCtx intctrlutil.RequestCtx,
pvc *corev1.PersistentVolumeClaim,
pv *corev1.PersistentVolume) error {
capacity := pv.Spec.Capacity.DeepCopy()
accessModes := slices.Clone(pv.Spec.AccessModes)
if pvc.Status.Phase == corev1.ClaimBound &&
reflect.DeepEqual(pvc.Status.Capacity, capacity) &&
slices.Equal(pvc.Status.AccessModes, accessModes) {
return nil
}
patch := client.MergeFrom(pvc.DeepCopy())
pvc.Status.Phase = corev1.ClaimBound
pvc.Status.Capacity = capacity
pvc.Status.AccessModes = accessModes
return r.Client.Status().Patch(reqCtx.Ctx, pvc, patch)
}

func pvcBindingCompleted(pvc *corev1.PersistentVolumeClaim) bool {
if pvc.Spec.VolumeName == "" {
return false
Expand Down
7 changes: 4 additions & 3 deletions controllers/dataprotection/volumepopulator_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,6 +2071,7 @@ func TestCompleteBoundPVCReleasesPopulatePVCBeforeWaitingForPostReady(t *testing
pvc.UID = types.UID("target-pvc")
pvc.Finalizers = []string{dptypes.DataProtectionFinalizerName}
pvc.Spec.VolumeName = "data-pv"
pvc.Status.Phase = corev1.ClaimPending
pvc.Annotations[volume.AnnBindCompleted] = "yes"
pvc.Spec.DataSourceRef = &corev1.TypedObjectReference{
APIGroup: &apiGroup,
Expand Down Expand Up @@ -2149,9 +2150,9 @@ func TestCompleteBoundPVCReleasesPopulatePVCBeforeWaitingForPostReady(t *testing
currentPVC := &corev1.PersistentVolumeClaim{}
require.NoError(t, reconciler.Client.Get(context.Background(), client.ObjectKeyFromObject(pvc), currentPVC))
require.NotContains(t, currentPVC.Finalizers, dptypes.DataProtectionFinalizerName)
require.Equal(t, corev1.ClaimBound, currentPVC.Status.Phase)
require.Equal(t, resource.MustParse("1Gi"), currentPVC.Status.Capacity[corev1.ResourceStorage])
require.Equal(t, []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, currentPVC.Status.AccessModes)
require.Equal(t, corev1.ClaimPending, currentPVC.Status.Phase)
require.Empty(t, currentPVC.Status.Capacity)
require.Empty(t, currentPVC.Status.AccessModes)
populatingCondition := findPVCConditionByType(currentPVC, string(PersistentVolumeClaimPopulating))
require.NotNil(t, populatingCondition)
require.Equal(t, ReasonPopulatingSucceed, populatingCondition.Reason)
Expand Down
Loading