From d9b278edb97f2ff479eeab7eea0c3bd3a2c70eea Mon Sep 17 00:00:00 2001 From: MICHAEL S FRUCHTMAN Date: Mon, 14 Oct 2024 12:00:26 -0700 Subject: [PATCH] Revert "Expose VSC SourceVolumeMode" This reverts commit 7580538f031a1b998353c660fe0a6501e3866379. Signed-off-by: MICHAEL S FRUCHTMAN --- changelogs/unreleased/8261-msfrucht | 1 - pkg/exposer/csi_snapshot.go | 1 - pkg/exposer/csi_snapshot_test.go | 3 --- 3 files changed, 5 deletions(-) delete mode 100644 changelogs/unreleased/8261-msfrucht diff --git a/changelogs/unreleased/8261-msfrucht b/changelogs/unreleased/8261-msfrucht deleted file mode 100644 index dce88fc5e..000000000 --- a/changelogs/unreleased/8261-msfrucht +++ /dev/null @@ -1 +0,0 @@ -Expose VSC SourceVolumeMode \ No newline at end of file diff --git a/pkg/exposer/csi_snapshot.go b/pkg/exposer/csi_snapshot.go index 5bb247ebb..7ee8bbae6 100644 --- a/pkg/exposer/csi_snapshot.go +++ b/pkg/exposer/csi_snapshot.go @@ -369,7 +369,6 @@ func (e *csiSnapshotExposer) createBackupVSC(ctx context.Context, ownerObject co DeletionPolicy: snapshotv1api.VolumeSnapshotContentDelete, Driver: snapshotVSC.Spec.Driver, VolumeSnapshotClassName: snapshotVSC.Spec.VolumeSnapshotClassName, - SourceVolumeMode: snapshotVSC.Spec.SourceVolumeMode, }, } diff --git a/pkg/exposer/csi_snapshot_test.go b/pkg/exposer/csi_snapshot_test.go index 5c8aadc3e..0cbe65ffb 100644 --- a/pkg/exposer/csi_snapshot_test.go +++ b/pkg/exposer/csi_snapshot_test.go @@ -109,7 +109,6 @@ func TestExpose(t *testing.T) { } snapshotHandle := "fake-handle" - sourceVolumeMode := corev1.PersistentVolumeFilesystem vscObj := &snapshotv1api.VolumeSnapshotContent{ ObjectMeta: metav1.ObjectMeta{ Name: vscName, @@ -122,7 +121,6 @@ func TestExpose(t *testing.T) { DeletionPolicy: snapshotv1api.VolumeSnapshotContentDelete, Driver: "fake-driver", VolumeSnapshotClassName: &snapshotClass, - SourceVolumeMode: &sourceVolumeMode, }, Status: &snapshotv1api.VolumeSnapshotContentStatus{ RestoreSize: &restoreSize, @@ -524,7 +522,6 @@ func TestExpose(t *testing.T) { assert.Equal(t, expectedVSC.Spec.DeletionPolicy, vscObj.Spec.DeletionPolicy) assert.Equal(t, expectedVSC.Spec.Driver, vscObj.Spec.Driver) assert.Equal(t, *expectedVSC.Spec.VolumeSnapshotClassName, *vscObj.Spec.VolumeSnapshotClassName) - assert.Equal(t, *expectedVSC.Spec.SourceVolumeMode, *vscObj.Spec.SourceVolumeMode) if test.expectedVolumeSize != nil { assert.Equal(t, *test.expectedVolumeSize, backupPVC.Spec.Resources.Requests[corev1.ResourceStorage])