backup/restore phases for async plugin operations

Signed-off-by: Scott Seago <sseago@redhat.com>

changelogs/unreleased/5710-sseago

@@ -0,0 +1,4 @@
+new backup and restore phases to support async plugin operations:
+- WaitingForPluginOperations
+- WaitingForPluginOperationsPartiallyFailed
+

config/crd/v1/bases/velero.io_backups.yaml

@@ -455,6 +455,8 @@ spec:
                 - New
                 - FailedValidation
                 - InProgress
+                - WaitingForPluginOperations
+                - WaitingForPluginOperationsPartiallyFailed
                 - Completed
                 - PartiallyFailed
                 - Failed

config/crd/v1/bases/velero.io_restores.yaml

@@ -412,6 +412,8 @@ spec:
                 - New
                 - FailedValidation
                 - InProgress
+                - WaitingForPluginOperations
+                - WaitingForPluginOperationsPartiallyFailed
                 - Completed
                 - PartiallyFailed
                 - Failed

pkg/apis/velero/v1/backup.go

@@ -221,7 +221,7 @@ const (
 
 // BackupPhase is a string representation of the lifecycle phase
 // of a Velero backup.
-// +kubebuilder:validation:Enum=New;FailedValidation;InProgress;Completed;PartiallyFailed;Failed;Deleting
+// +kubebuilder:validation:Enum=New;FailedValidation;InProgress;WaitingForPluginOperations;WaitingForPluginOperationsPartiallyFailed;Completed;PartiallyFailed;Failed;Deleting
 type BackupPhase string
 
 const (
@@ -236,16 +236,20 @@ const (
 	// BackupPhaseInProgress means the backup is currently executing.
 	BackupPhaseInProgress BackupPhase = "InProgress"
 
-	// BackupPhaseUploading means the backups of Kubernetes resources
-	// and creation of snapshots was successful and snapshot data
-	// is currently uploading.  The backup is not usable yet.
-	BackupPhaseUploading BackupPhase = "Uploading"
+	// BackupPhaseWaitingForPluginOperations means the backup of
+	// Kubernetes resources, creation of snapshots, and other
+	// async plugin operations was successful and snapshot data is
+	// currently uploading or other plugin operations are still
+	// ongoing.  The backup is not usable yet.
+	BackupPhaseWaitingForPluginOperations BackupPhase = "WaitingForPluginOperations"
 
-	// BackupPhaseUploadingPartialFailure means the backup of Kubernetes
-	// resources and creation of snapshots partially failed (final phase
-	// will be PartiallyFailed) and snapshot data is currently uploading.
-	// The backup is not usable yet.
-	BackupPhaseUploadingPartialFailure BackupPhase = "UploadingPartialFailure"
+	// BackupPhaseWaitingForPluginOperationsPartiallyFailed means
+	// the backup of Kubernetes resources, creation of snapshots,
+	// and other async plugin operations partially failed (final
+	// phase will be PartiallyFailed) and snapshot data is
+	// currently uploading or other plugin operations are still
+	// ongoing.  The backup is not usable yet.
+	BackupPhaseWaitingForPluginOperationsPartiallyFailed BackupPhase = "WaitingForPluginOperationsPartiallyFailed"
 
 	// BackupPhaseCompleted means the backup has run successfully without
 	// errors.

pkg/apis/velero/v1/restore.go

@@ -220,7 +220,7 @@ type InitRestoreHook struct {
 
 // RestorePhase is a string representation of the lifecycle phase
 // of a Velero restore
-// +kubebuilder:validation:Enum=New;FailedValidation;InProgress;Completed;PartiallyFailed;Failed
+// +kubebuilder:validation:Enum=New;FailedValidation;InProgress;WaitingForPluginOperations;WaitingForPluginOperationsPartiallyFailed;Completed;PartiallyFailed;Failed
 type RestorePhase string
 
 const (
@@ -235,6 +235,19 @@ const (
 	// RestorePhaseInProgress means the restore is currently executing.
 	RestorePhaseInProgress RestorePhase = "InProgress"
 
+	// RestorePhaseWaitingForPluginOperations means the restore of
+	// Kubernetes resources and other async plugin operations was
+	// successful and plugin operations are still ongoing.  The
+	// restore is not complete yet.
+	RestorePhaseWaitingForPluginOperations RestorePhase = "WaitingForPluginOperations"
+
+	// RestorePhaseWaitingForPluginOperationsPartiallyFailed means
+	// the restore of Kubernetes resources and other async plugin
+	// operations partially failed (final phase will be
+	// PartiallyFailed) and other plugin operations are still
+	// ongoing.  The restore is not complete yet.
+	RestorePhaseWaitingForPluginOperationsPartiallyFailed RestorePhase = "WaitingForPluginOperationsPartiallyFailed"
+
 	// RestorePhaseCompleted means the restore has run successfully
 	// without errors.
 	RestorePhaseCompleted RestorePhase = "Completed"

site/content/docs/main/api-types/backup.md

@@ -145,7 +145,9 @@ status:
   version: 1
   # The date and time when the Backup is eligible for garbage collection.
   expiration: null
-  # The current phase. Valid values are New, FailedValidation, InProgress, Completed, PartiallyFailed, Failed.
+  # The current phase.
+  # Valid values are New, FailedValidation, InProgress, WaitingForPluginOperations,
+  # WaitingForPluginOperationsPartiallyFailed, Completed, PartiallyFailed, Failed.
   phase: ""
   # An array of any validation errors encountered.
   validationErrors: null

site/content/docs/main/api-types/restore.md

@@ -179,7 +179,9 @@ spec:
           onError: Continue
 # RestoreStatus captures the current status of a Velero restore. Users should not set any data here.
 status:
-  # The current phase. Valid values are New, FailedValidation, InProgress, Completed, PartiallyFailed, Failed.
+  # The current phase.
+  # Valid values are New, FailedValidation, InProgress, WaitingForPluginOperations,
+  # WaitingForPluginOperationsPartiallyFailed, Completed, PartiallyFailed, Failed.
   phase: ""
   # An array of any validation errors encountered.
   validationErrors: null

site/content/docs/main/api-types/schedule.md

@@ -143,7 +143,8 @@ spec:
           post:
             # Same content as pre above.
 status:
-  # The current phase of the latest scheduled backup. Valid values are New, FailedValidation, InProgress, Completed, PartiallyFailed, Failed.
+  # The current phase.
+  # Valid values are New, Enabled, FailedValidation.
   phase: ""
   # Date/time of the last backup for a given schedule
   lastBackup: