Merge pull request #8301 from msfrucht/revert_expose_sourcevolumemode

Revert "Expose VSC SourceVolumeMode" 1.15
This commit is contained in:
lyndon-li
2024-10-16 10:04:46 +08:00
committed by GitHub
3 changed files with 0 additions and 5 deletions

View File

@@ -1 +0,0 @@
Expose VSC SourceVolumeMode

View File

@@ -378,7 +378,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,
},
}

View File

@@ -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])