Skip to content

merge queue: embarking devel (cba25cb) and #5962 together #5970

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

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking devel (cba25cb) and #5962 together #5970

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd7076
Revert "rbd: fetch the volumeIds from VGRContent's status for omap data"
Nikhil-Ladha Jan 22, 2026
d86fc8b
Merge of #5962
mergify[bot] Jan 23, 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
11 changes: 1 addition & 10 deletions internal/controller/volumegroup/volumegroupreplicationcontent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,16 +207,7 @@ func (r *ReconcileVGRContent) reconcileVGRContent(ctx context.Context, obj runti

reqName := vgrc.Name
groupHandle := vgrc.Spec.VolumeGroupReplicationHandle
volumeRefs := vgrc.Status.PersistentVolumeRefList
volumeIds := make([]string, len(volumeRefs))
for i := range volumeRefs {
pv := &corev1.PersistentVolume{}
err := r.client.Get(ctx, types.NamespacedName{Name: volumeRefs[i].Name}, pv)
if err != nil {
return fmt.Errorf("failed to get persistentvolume %s: %w", volumeRefs[i].Name, err)
}
volumeIds[i] = pv.Spec.CSI.VolumeHandle
}
volumeIds := vgrc.Spec.Source.VolumeHandles

if groupHandle == "" {
return errors.New("volume group replication handle is empty")
Expand Down
Loading