mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 22:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump up the versions of severel Kubernetes-related libs

Browse Source 
Bump up the versions of severel Kubernetes-related libs

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
This commit is contained in:
Wenkai Yin(尹文开)
2024-02-29 14:51:51 +08:00
parent e727d29bcd
commit 8752c3a820
70 changed files with 335 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/podvolume/backupper.go
View File

@@ -117,7 +117,7 @@ func newBackupper(
results: make(map[string]chan *velerov1api.PodVolumeBackup),
}
pvbInformer.AddEventHandler(
_, _ = pvbInformer.AddEventHandler(
cache.ResourceEventHandlerFuncs{
UpdateFunc: func(_, obj interface{}) {
pvb := obj.(*velerov1api.PodVolumeBackup)
@@ -225,8 +225,8 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api.
var (
podVolumeBackups []*velerov1api.PodVolumeBackup
mountedPodVolumes = sets.String{}
attachedPodDevices = sets.String{}
mountedPodVolumes = sets.Set[string]{}
attachedPodDevices = sets.Set[string]{}
)
for _, container := range pod.Spec.Containers {

6
pkg/podvolume/restorer.go
View File

@@ -88,7 +88,7 @@ func newRestorer(
log: log,
}
pvrInformer.AddEventHandler(
_, _ = pvrInformer.AddEventHandler(
cache.ResourceEventHandlerFuncs{
UpdateFunc: func(_, obj interface{}) {
pvr := obj.(*velerov1api.PodVolumeRestore)
@@ -205,8 +205,8 @@ func (r *restorer) RestorePodVolumes(data RestoreData) []error {
return true, nil
}
err := wait.PollWithContext(checkCtx, time.Millisecond*500, time.Minute*10, checkFunc)
if err == wait.ErrWaitTimeout {
err := wait.PollUntilContextTimeout(checkCtx, time.Millisecond*500, time.Minute*10, true, checkFunc)
if wait.Interrupted(err) {
r.log.WithError(err).Error("Restoring pod is not scheduled until timeout or cancel, disengage")
} else if err != nil {
r.log.WithError(err).Error("Failed to check node-agent pod status, disengage")