Merge pull request #185 from blackpiglet/add_missing_riav2_method

Add AreAdditionalItemsReady method for RIA v2.
vmware-tanzu · Jun 20, 2023 · aa06f02 · aa06f02
2 parents d6d822c + 83a51e1
commit aa06f02
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/internal/restore/pvc_action.go b/internal/restore/pvc_action.go
@@ -197,6 +197,10 @@ func (p *PVCRestoreItemAction) Cancel(operationID string, restore *velerov1api.R
 	return nil
 }
 
+func (p *PVCRestoreItemAction) AreAdditionalItemsReady(additionalItems []velero.ResourceIdentifier, restore *velerov1api.Restore) (bool, error) {
+	return true, nil
+}
+
 func getDataUploadResult(ctx context.Context, restore *velerov1api.Restore, pvc *corev1api.PersistentVolumeClaim,
 	kubeClient kubernetes.Interface) (*velerov2alpha1.DataUploadResult, error) {
 	cmList, err := kubeClient.CoreV1().ConfigMaps(restore.Namespace).List(ctx, metav1.ListOptions{

diff --git a/internal/restore/volumesnapshot_action.go b/internal/restore/volumesnapshot_action.go
@@ -170,3 +170,7 @@ func (p *VolumeSnapshotRestoreItemAction) Progress(operationID string, restore *
 func (p *VolumeSnapshotRestoreItemAction) Cancel(operationID string, restore *velerov1api.Restore) error {
 	return nil
 }
+
+func (p *VolumeSnapshotRestoreItemAction) AreAdditionalItemsReady(additionalItems []velero.ResourceIdentifier, restore *velerov1api.Restore) (bool, error) {
+	return true, nil
+}
diff --git a/internal/restore/volumesnapshotclass_action.go b/internal/restore/volumesnapshotclass_action.go
@@ -91,3 +91,7 @@ func (p *VolumeSnapshotClassRestoreItemAction) Progress(operationID string, rest
 func (p *VolumeSnapshotClassRestoreItemAction) Cancel(operationID string, restore *velerov1api.Restore) error {
 	return nil
 }
+
+func (p *VolumeSnapshotClassRestoreItemAction) AreAdditionalItemsReady(additionalItems []velero.ResourceIdentifier, restore *velerov1api.Restore) (bool, error) {
+	return true, nil
+}
diff --git a/internal/restore/volumesnapshotcontent_action.go b/internal/restore/volumesnapshotcontent_action.go
@@ -92,3 +92,7 @@ func (p *VolumeSnapshotContentRestoreItemAction) Progress(operationID string, re
 func (p *VolumeSnapshotContentRestoreItemAction) Cancel(operationID string, restore *velerov1api.Restore) error {
 	return nil
 }
+
+func (p *VolumeSnapshotContentRestoreItemAction) AreAdditionalItemsReady(additionalItems []velero.ResourceIdentifier, restore *velerov1api.Restore) (bool, error) {
+	return true, nil
+}