Skip populate VolumeInfo for data-moved PV when CSI is not enabled.

Signed-off-by: Xun Jiang <blackpigletbruce@gmail.com>
vmware-tanzu · Mar 13, 2024 · f8deea1 · f8deea1
1 parent 4d01c7f
commit f8deea1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/changelogs/unreleased/7515-blackpiglet b/changelogs/unreleased/7515-blackpiglet
@@ -0,0 +1,2 @@
+Check whether the VolumeSnapshot's source PVC is nil before using it.
+Skip populate VolumeInfo for data-moved PV when CSI is not enabled.
diff --git a/internal/volume/volumes_information.go b/internal/volume/volumes_information.go
@@ -28,6 +28,7 @@ import (
 
 	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/features"
 	"github.com/vmware-tanzu/velero/pkg/itemoperation"
 	"github.com/vmware-tanzu/velero/pkg/kuberesource"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
@@ -462,6 +463,11 @@ func (v *VolumesInformation) generateVolumeInfoFromPVB() {
 
 // generateVolumeInfoFromDataUpload generate VolumeInfo for DataUpload.
 func (v *VolumesInformation) generateVolumeInfoFromDataUpload() {
+	if !features.IsEnabled(velerov1api.CSIFeatureFlag) {
+		v.logger.Debug("Skip generating VolumeInfo when the CSI feature is disabled.")
+		return
+	}
+
 	tmpVolumeInfos := make([]*VolumeInfo, 0)
 	vsClassList := new(snapshotv1api.VolumeSnapshotClassList)
 	if err := v.crClient.List(context.TODO(), vsClassList); err != nil {

diff --git a/internal/volume/volumes_information_test.go b/internal/volume/volumes_information_test.go
@@ -31,6 +31,7 @@ import (
 	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"
+	"github.com/vmware-tanzu/velero/pkg/features"
 	"github.com/vmware-tanzu/velero/pkg/itemoperation"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
 	velerotest "github.com/vmware-tanzu/velero/pkg/test"
@@ -605,6 +606,8 @@ func TestGenerateVolumeInfoFromPVB(t *testing.T) {
 }
 
 func TestGenerateVolumeInfoFromDataUpload(t *testing.T) {
+	features.Enable(velerov1api.CSIFeatureFlag)
+	defer features.Disable(velerov1api.CSIFeatureFlag)
 	now := metav1.Now()
 	tests := []struct {
 		name                string