Merge pull request #10126 from blackpiglet/jxun/parent_snapshot

Use "" as parentSnapshot for DU when BackupType is incremental.

changelogs/unreleased/10126-blackpiglet

@@ -0,0 +1 @@
+Use "" as parentSnapshot for DU when BackupType is incremental.

pkg/backup/actions/csi/pvc_action.go

@@ -536,14 +536,10 @@ func newDataUpload(
 	vsc *snapshotv1api.VolumeSnapshotContent,
 	fsType string,
 ) *velerov2alpha1.DataUpload {
-	var parentSnapshot string
-	switch backup.Spec.BackupType {
-	case velerov1api.BackupTypeFull:
+	parentSnapshot := ""
+
+	if backup.Spec.BackupType == velerov1api.BackupTypeFull {
 		parentSnapshot = veleroshared.DataUploadParentSnapshotNone
-	case velerov1api.BackupTypeIncremental:
-		parentSnapshot = veleroshared.DataUploadParentSnapshotAuto
-	default:
-		parentSnapshot = veleroshared.DataUploadParentSnapshotAuto
 	}
 
 	dataUpload := &velerov2alpha1.DataUpload{

pkg/backup/actions/csi/pvc_action_test.go

@@ -45,7 +45,6 @@ import (
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
-	veleroshared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
 	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
 	"github.com/vmware-tanzu/velero/pkg/builder"
@@ -162,7 +161,7 @@ func TestExecute(t *testing.T) {
 					SourcePVC:        "testPVC",
 					SourceNamespace:  "velero",
 					OperationTimeout: metav1.Duration{Duration: 1 * time.Minute},
-					ParentSnapshot:   veleroshared.DataUploadParentSnapshotAuto,
+					ParentSnapshot:   "",
 				},
 			},
 		},
@@ -2199,7 +2198,7 @@ func TestNewDataUpload(t *testing.T) {
 			backupType:         velerov1api.BackupTypeIncremental,
 			vsClassName:        ptr.To("test-vs-class"),
 			uploaderConfig:     &velerov1api.UploaderConfigForBackup{ParallelFilesUpload: 10},
-			expectedParentSnap: "auto",
+			expectedParentSnap: "",
 			expectedDataMoverCfg: map[string]string{
 				uploaderUtil.ParallelFilesUpload: "10",
 			},
@@ -2209,7 +2208,7 @@ func TestNewDataUpload(t *testing.T) {
 			backupType:           "",
 			vsClassName:          ptr.To("test-vs-class"),
 			uploaderConfig:       &velerov1api.UploaderConfigForBackup{ParallelFilesUpload: 0},
-			expectedParentSnap:   "auto",
+			expectedParentSnap:   "",
 			expectedDataMoverCfg: nil,
 		},
 	}