Merge pull request #191 from blackpiglet/resolve_conflict

Resolve conflict with PR #180
vmware-tanzu · Jul 21, 2023 · 18ce893 · 18ce893
2 parents 77ee0b4 + 6a5a13e
commit 18ce893
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,4 +48,5 @@ site/vendor
 
 .vs
 
-_tiltbuild
+_tiltbuild
+coverage.out
diff --git a/internal/restore/pvc_action.go b/internal/restore/pvc_action.go
@@ -170,7 +170,7 @@ func (p *PVCRestoreItemAction) Execute(input *velero.RestoreItemActionExecuteInp
 			}
 			logger.Infof("DataDownload %s/%s is created successfully.", dataDownload.Namespace, dataDownload.Name)
 		} else {
-			volumeSnapshotName, ok := pvc.Annotations[util.VolumeSnapshotLabel]
+			volumeSnapshotName, ok := pvcFromBackup.Annotations[util.VolumeSnapshotLabel]
 			if !ok {
 				logger.Info("Skipping PVCRestoreItemAction for PVC , PVC does not have a CSI volumesnapshot.")
 				// Make no change in the input PVC.

diff --git a/internal/restore/pvc_action_test.go b/internal/restore/pvc_action_test.go
@@ -564,7 +564,7 @@ func TestExecute(t *testing.T) {
 				DataSourceRef(&corev1api.TypedLocalObjectReference{APIGroup: &snapshotv1api.SchemeGroupVersion.Group, Kind: util.VolumeSnapshotKindName, Name: "testVS"}).
 				Result(),
 			vs:          builder.ForVolumeSnapshot("velero", "testVS").ObjectMeta(builder.WithAnnotations(util.VolumeSnapshotRestoreSize, "10Gi")).Result(),
-			expectedPVC: builder.ForPersistentVolumeClaim("velero", "testPVC").ObjectMeta(builder.WithAnnotations("velero.io/volume-snapshot-name", "testVS")).Result(),
+			expectedPVC: builder.ForPersistentVolumeClaim("velero", "testPVC").Result(),
 		},
 		{
 			name:        "Restore from VolumeSnapshot without volume-snapshot-name annotation",