Skip to content

use helper function for label selector in volumegroupreplication #799

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
mergify merged 1 commit into from
Apr 24, 2025
Merged

use helper function for label selector in volumegroupreplication #799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 7 additions & 25 deletions internal/controller/replication.storage/volumegroupreplication_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -492,36 +491,19 @@ func (r *VolumeGroupReplicationReconciler) setGroupReplicationFailure(
func (r *VolumeGroupReplicationReconciler) getMatchingPVCsFromSource(instance *replicationv1alpha1.VolumeGroupReplication) ([]corev1.PersistentVolumeClaim, string, error) {

pvcList := corev1.PersistentVolumeClaimList{}
newSelector := labels.NewSelector()

if instance.Spec.Source.Selector.MatchLabels != nil {
for key, value := range instance.Spec.Source.Selector.MatchLabels {
req, err := labels.NewRequirement(key, selection.Equals, []string{value})
if err != nil {
r.log.Error(err, "failed to add label selector requirement", "Selector Key", key, "Selector Value", value)
return nil, "", err
}
newSelector = newSelector.Add(*req)
}
selector, err := metav1.LabelSelectorAsSelector(instance.Spec.Source.Selector)
Comment thread
black-dragon74 marked this conversation as resolved.
if err != nil {
return nil, "", err
}

if instance.Spec.Source.Selector.MatchExpressions != nil {
for _, labelExp := range instance.Spec.Source.Selector.MatchExpressions {
req, err := labels.NewRequirement(labelExp.Key, selection.Operator(labelExp.Operator), labelExp.Values)
if err != nil {
r.log.Error(err, "failed to add label selector requirement", "Selector Key", labelExp.Key, "Selector Values", labelExp.Values)
return nil, "", err
}
newSelector = newSelector.Add(*req)
}
}
opts := []client.ListOption{
client.MatchingLabelsSelector{Selector: newSelector},
client.MatchingLabelsSelector{Selector: selector},
client.InNamespace(instance.Namespace),
}
err := r.List(r.ctx, &pvcList, opts...)
err = r.List(r.ctx, &pvcList, opts...)
if err != nil {
r.log.Error(err, "failed to list pvcs with the given selectors", "Selector", newSelector.String())
r.log.Error(err, "failed to list pvcs with the given selectors", "Selector", selector.String())
return nil, "", err
}

Expand All @@ -536,7 +518,7 @@ func (r *VolumeGroupReplicationReconciler) getMatchingPVCsFromSource(instance *r
}
}

return pvcList.Items, newSelector.String(), nil
return pvcList.Items, selector.String(), nil
}

// getPVHandles fetches the PV handles for the respective PVCs
Expand Down
Loading