diff --git a/go.mod b/go.mod index e88e92bfc..f0cd0a3f6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ramendr/ramen -go 1.22.7 +go 1.22.8 toolchain go1.22.9 @@ -21,7 +21,7 @@ require ( github.com/ramendr/ramen/api v0.0.0-20240924121439-b7cba82de417 github.com/ramendr/recipe v0.0.0-20240918115450-667b9d79599f github.com/stolostron/multicloud-operators-placementrule v1.2.4-1-20220311-8eedb3f.0.20230828200208-cd3c119a7fa0 - github.com/vmware-tanzu/velero v1.9.1 + github.com/vmware-tanzu/velero v1.15.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 golang.org/x/time v0.8.0 diff --git a/go.sum b/go.sum index fa7619800..0c2edd110 100644 --- a/go.sum +++ b/go.sum @@ -153,8 +153,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/vmware-tanzu/velero v1.9.1 h1:uZhNMq1Pn8AZjT7HLtKseTq47EeHeIuUxvGPFFp/+Vs= -github.com/vmware-tanzu/velero v1.9.1/go.mod h1:75v4RUMzs8RK6Kqmrg6jgIOBaHUgAWwWAFiWERw2l4U= +github.com/vmware-tanzu/velero v1.15.0 h1:+S/lNSDwQqlROGWfmNuZnnabopGmco978COIt3AP09c= +github.com/vmware-tanzu/velero v1.15.0/go.mod h1:28VhzPJRBo91GBRkgs4Ird0fx2vCpepBWmhF+5Pn/WQ= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/internal/controller/kubeobjects/velero/requests.go b/internal/controller/kubeobjects/velero/requests.go index 919ea225c..c01c2d1df 100644 --- a/internal/controller/kubeobjects/velero/requests.go +++ b/internal/controller/kubeobjects/velero/requests.go @@ -246,9 +246,11 @@ func backupDummyStatusProcessAndRestore( ) case velero.BackupPhaseNew, velero.BackupPhaseInProgress, - velero.BackupPhaseUploading, - velero.BackupPhaseUploadingPartialFailure, - velero.BackupPhaseDeleting: + velero.BackupPhaseWaitingForPluginOperations, + velero.BackupPhaseWaitingForPluginOperationsPartiallyFailed, + velero.BackupPhaseDeleting, + velero.BackupPhaseFinalizing, + velero.BackupPhaseFinalizingPartiallyFailed: return nil, kubeobjects.RequestProcessingErrorCreate("backup" + string(backup.Status.Phase)) case velero.BackupPhaseFailedValidation: return nil, errors.New("backup" + string(backup.Status.Phase)) @@ -282,7 +284,11 @@ func restoreStatusProcess( case velero.RestorePhaseCompleted: return nil case velero.RestorePhaseNew, - velero.RestorePhaseInProgress: + velero.RestorePhaseInProgress, + velero.RestorePhaseWaitingForPluginOperations, + velero.RestorePhaseWaitingForPluginOperationsPartiallyFailed, + velero.RestorePhaseFinalizing, + velero.RestorePhaseFinalizingPartiallyFailed: return kubeobjects.RequestProcessingErrorCreate("restore" + string(restore.Status.Phase)) case velero.RestorePhaseFailed, velero.RestorePhaseFailedValidation, @@ -396,9 +402,11 @@ func backupRealStatusProcess( return nil case velero.BackupPhaseNew, velero.BackupPhaseInProgress, - velero.BackupPhaseUploading, - velero.BackupPhaseUploadingPartialFailure, - velero.BackupPhaseDeleting: + velero.BackupPhaseWaitingForPluginOperations, + velero.BackupPhaseWaitingForPluginOperationsPartiallyFailed, + velero.BackupPhaseDeleting, + velero.BackupPhaseFinalizing, + velero.BackupPhaseFinalizingPartiallyFailed: return kubeobjects.RequestProcessingErrorCreate("backup" + string(backup.Status.Phase)) case velero.BackupPhaseFailedValidation, velero.BackupPhasePartiallyFailed,