mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-29 11:16:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add set-based label selector test and docs coverage for restore

Browse Source 
Restore label selector filtering had only equality-based coverage;
set-based selectors were exercised nowhere in the repo, relying
entirely on apimachinery behavior. Add notin, in, and doesnotexist
(!key) cases to TestRestoreResourceFiltering and set-based parse
cases for the --selector CLI flag.

Also document restore usage of --selector in resource-filtering.md:
the notin phased-restore scenario (noting notin also matches
resources without the label key), restoring only unlabeled resources
via '!<key>', and the caveat that restore item action dependencies
bypass label selectors.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
This commit is contained in:
Tiger Kaovilai
2026-08-27 13:01:08 -04:00
co-authored by Claude Fable 5
parent 836689f6cc
commit b7ffd55085
3 changed files with 139 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/util/flag/label_selector_test.go
+22
View File
@@ -24,6 +24,28 @@ func TestSetOfLabelSelector(t *testing.T) {
assert.True(t, str == "k1=v1,k2=v2" || str == "k2=v2,k2=v2")
}
func TestSetOfSetBasedLabelSelector(t *testing.T) {
selector := &LabelSelector{}
require.NoError(t, selector.Set("pr-label notin (1)"))
require.NotNil(t, selector.LabelSelector)
require.Len(t, selector.LabelSelector.MatchExpressions, 1)
req := selector.LabelSelector.MatchExpressions[0]
assert.Equal(t, "pr-label", req.Key)
assert.Equal(t, metav1.LabelSelectorOpNotIn, req.Operator)
assert.Equal(t, []string{"1"}, req.Values)
}
func TestSetOfDoesNotExistLabelSelector(t *testing.T) {
selector := &LabelSelector{}
require.NoError(t, selector.Set("!pr-label"))
require.NotNil(t, selector.LabelSelector)
require.Len(t, selector.LabelSelector.MatchExpressions, 1)
req := selector.LabelSelector.MatchExpressions[0]
assert.Equal(t, "pr-label", req.Key)
assert.Equal(t, metav1.LabelSelectorOpDoesNotExist, req.Operator)
assert.Empty(t, req.Values)
}
func TestTypeOfLabelSelector(t *testing.T) {
selector := &LabelSelector{}
assert.Equal(t, "labelSelector", selector.Type())
pkg/restore/restore_test.go
+93
View File
@@ -453,6 +453,99 @@ func TestRestoreResourceFiltering(t *testing.T) {
test.PVs(): {"/pv-1"},
},
},
{
name: "notin label selector excludes matching resources",
restore: defaultRestore().LabelSelector(&metav1.LabelSelector{MatchExpressions: []metav1.LabelSelectorRequirement{
{Key: "pr-label", Operator: metav1.LabelSelectorOpNotIn, Values: []string{"1"}},
}}).Result(),
backup: defaultBackup().Result(),
tarball: test.NewTarWriter(t).
AddItems("pods",
builder.ForPod("ns-1", "pod-1").ObjectMeta(builder.WithLabels("pr-label", "1")).Result(),
builder.ForPod("ns-2", "pod-2").Result(),
).
AddItems("deployments.apps",
builder.ForDeployment("ns-1", "deploy-1").Result(),
builder.ForDeployment("ns-2", "deploy-2").ObjectMeta(builder.WithLabels("pr-label", "1")).Result(),
).
AddItems("persistentvolumes",
builder.ForPersistentVolume("pv-1").ObjectMeta(builder.WithLabels("pr-label", "1")).Result(),
builder.ForPersistentVolume("pv-2").ObjectMeta(builder.WithLabels("pr-label", "2")).Result(),
).
Done(),
apiResources: []*test.APIResource{
test.Pods(),
test.Deployments(),
test.PVs(),
},
want: map[*test.APIResource][]string{
test.Pods(): {"ns-2/pod-2"},
test.Deployments(): {"ns-1/deploy-1"},
test.PVs(): {"/pv-2"},
},
},
{
name: "in label selector only restores matching resources",
restore: defaultRestore().LabelSelector(&metav1.LabelSelector{MatchExpressions: []metav1.LabelSelectorRequirement{
{Key: "pr-label", Operator: metav1.LabelSelectorOpIn, Values: []string{"1", "2"}},
}}).Result(),
backup: defaultBackup().Result(),
tarball: test.NewTarWriter(t).
AddItems("pods",
builder.ForPod("ns-1", "pod-1").ObjectMeta(builder.WithLabels("pr-label", "1")).Result(),
builder.ForPod("ns-2", "pod-2").ObjectMeta(builder.WithLabels("pr-label", "3")).Result(),
).
AddItems("deployments.apps",
builder.ForDeployment("ns-1", "deploy-1").Result(),
builder.ForDeployment("ns-2", "deploy-2").ObjectMeta(builder.WithLabels("pr-label", "2")).Result(),
).
AddItems("persistentvolumes",
builder.ForPersistentVolume("pv-1").ObjectMeta(builder.WithLabels("pr-label", "2")).Result(),
builder.ForPersistentVolume("pv-2").Result(),
).
Done(),
apiResources: []*test.APIResource{
test.Pods(),
test.Deployments(),
test.PVs(),
},
want: map[*test.APIResource][]string{
test.Pods(): {"ns-1/pod-1"},
test.Deployments(): {"ns-2/deploy-2"},
test.PVs(): {"/pv-1"},
},
},
{
name: "doesnotexist label selector only restores resources without the label key",
restore: defaultRestore().LabelSelector(&metav1.LabelSelector{MatchExpressions: []metav1.LabelSelectorRequirement{
{Key: "pr-label", Operator: metav1.LabelSelectorOpDoesNotExist},
}}).Result(),
backup: defaultBackup().Result(),
tarball: test.NewTarWriter(t).
AddItems("pods",
builder.ForPod("ns-1", "pod-1").ObjectMeta(builder.WithLabels("pr-label", "1")).Result(),
builder.ForPod("ns-2", "pod-2").Result(),
).
AddItems("deployments.apps",
builder.ForDeployment("ns-1", "deploy-1").Result(),
builder.ForDeployment("ns-2", "deploy-2").ObjectMeta(builder.WithLabels("pr-label", "2")).Result(),
).
AddItems("persistentvolumes",
builder.ForPersistentVolume("pv-1").ObjectMeta(builder.WithLabels("other-label", "x")).Result(),
builder.ForPersistentVolume("pv-2").ObjectMeta(builder.WithLabels("pr-label", "1")).Result(),
).
Done(),
apiResources: []*test.APIResource{
test.Pods(),
test.Deployments(),
test.PVs(),
},
want: map[*test.APIResource][]string{
test.Pods(): {"ns-2/pod-2"},
test.Deployments(): {"ns-1/deploy-1"},
test.PVs(): {"/pv-1"},
},
},
{
name: "OrLabelSelectors only restores matching resources",
restore: defaultRestore().OrLabelSelector([]*metav1.LabelSelector{{MatchLabels: map[string]string{"a1": "b1"}}, {MatchLabels: map[string]string{"a2": "b2"}},