mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-06 08:07:11 +00:00
Bug fix: Calculate label using backup name for CSI objects (#2510)
* Use a helper function when querying w/ backup label Setting or querying for a backup label name should always pass the value through the GetValidName function. This change passes query uses of the backup label value through the GetValidName function by introducing 2 new helpers, one for making a Selector, one for making a ListOptions. It also removes functions returning the same data, but under unecessarily specific names. Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Document using the label.GetValidName function Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Update copyright year Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Clarify labels.GetValidName and annotations Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Move functions to pkg/label Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Fix function comments Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
This commit is contained in:
@@ -32,6 +32,7 @@ import (
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/buildinfo"
|
||||
velerov1client "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/restic"
|
||||
@@ -75,7 +76,7 @@ func (a *ResticRestoreAction) Execute(input *velero.RestoreItemActionExecuteInpu
|
||||
|
||||
log := a.logger.WithField("pod", kube.NamespaceAndName(&pod))
|
||||
|
||||
opts := restic.NewPodVolumeBackupListOptions(input.Restore.Spec.BackupName)
|
||||
opts := label.NewListOptionsForBackup(input.Restore.Spec.BackupName)
|
||||
podVolumeBackupList, err := a.podVolumeBackupClient.List(opts)
|
||||
if err != nil {
|
||||
return nil, errors.WithStack(err)
|
||||
|
||||
Reference in New Issue
Block a user