vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bugs preventing pod volume backups from syncing properly 

Signed-off-by: Steve Kriss <krisss@vmware.com>
pull/1727/head
Steve Kriss 2019-08-06 09:05:54 -06:00
parent a590fc9468
commit 6522ba7c42
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/backup_sync_controller.go
View File

@ -232,7 +232,7 @@ func (c *backupSyncController) run() {
// process the pod volume backups from object store, if any
podVolumeBackups, err := backupStore.GetPodVolumeBackups(backupName)
if err != nil {
log.WithError(errors.WithStack(err)).Error("Error getting pod volumes for this backup from backup store")
log.WithError(errors.WithStack(err)).Error("Error getting pod volume backups for this backup from backup store")
continue
}
@ -240,9 +240,10 @@ func (c *backupSyncController) run() {
log = log.WithField("podVolumeBackup", podVolumeBackup.Name)
log.Debug("Checking this pod volume backup to see if it needs to be synced into the cluster")
for _, or := range podVolumeBackup.ObjectMeta.OwnerReferences {
if or.Name == backup.Name {
or.UID = backup.UID
for i, ownerRef := range podVolumeBackup.OwnerReferences {
if ownerRef.APIVersion == velerov1api.SchemeGroupVersion.String() && ownerRef.Kind == "Backup" && ownerRef.Name == backup.Name {
log.WithField("uid", backup.UID).Debugf("Updating pod volume backup's owner reference UID")
podVolumeBackup.OwnerReferences[i].UID = backup.UID
}
}
@ -250,6 +251,8 @@ func (c *backupSyncController) run() {
podVolumeBackup.Labels[velerov1api.BackupUIDLabel] = string(backup.UID)
}
podVolumeBackup.ResourceVersion = ""
_, err = c.podVolumeBackupClient.PodVolumeBackups(backup.Namespace).Create(podVolumeBackup)
switch {
case err != nil && kuberrs.IsAlreadyExists(err):