diff --git a/pkg/cmd/util/output/backup_describer.go b/pkg/cmd/util/output/backup_describer.go index c3224a862..032c5bd53 100644 --- a/pkg/cmd/util/output/backup_describer.go +++ b/pkg/cmd/util/output/backup_describer.go @@ -37,7 +37,6 @@ import ( veleroapishared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" - "github.com/vmware-tanzu/velero/pkg/features" "github.com/vmware-tanzu/velero/pkg/itemoperation" "github.com/vmware-tanzu/velero/internal/volume" @@ -532,10 +531,6 @@ func retrieveCSISnapshotLegacy(ctx context.Context, kbClient kbclient.Client, ba status := backup.Status csiSnapshots := []*volume.VolumeInfo{} - if !features.IsEnabled(velerov1api.CSIFeatureFlag) { - return csiSnapshots, nil - } - if status.CSIVolumeSnapshotsAttempted == 0 { return csiSnapshots, nil } @@ -628,10 +623,6 @@ func describNativeSnapshot(d *Describer, details bool, info *volume.VolumeInfo) } func describeCSISnapshots(d *Describer, details bool, infos []*volume.VolumeInfo, legacyInfoSource bool) { - if !features.IsEnabled(velerov1api.CSIFeatureFlag) { - return - } - if len(infos) == 0 { if legacyInfoSource { d.Printf("\tCSI Snapshots: \n") diff --git a/pkg/cmd/util/output/backup_describer_test.go b/pkg/cmd/util/output/backup_describer_test.go index a43ea9584..53aeed68f 100644 --- a/pkg/cmd/util/output/backup_describer_test.go +++ b/pkg/cmd/util/output/backup_describer_test.go @@ -7,7 +7,6 @@ import ( "time" "github.com/vmware-tanzu/velero/internal/volume" - "github.com/vmware-tanzu/velero/pkg/features" "github.com/vmware-tanzu/velero/pkg/itemoperation" "github.com/stretchr/testify/require" @@ -373,11 +372,6 @@ func TestDescribeNativeSnapshots(t *testing.T) { } func TestCSISnapshots(t *testing.T) { - features.Enable(velerov1api.CSIFeatureFlag) - defer func() { - features.Disable(velerov1api.CSIFeatureFlag) - }() - testcases := []struct { name string volumeInfo []*volume.VolumeInfo diff --git a/pkg/cmd/util/output/backup_structured_describer.go b/pkg/cmd/util/output/backup_structured_describer.go index 1f6e7d540..17f0d0d35 100644 --- a/pkg/cmd/util/output/backup_structured_describer.go +++ b/pkg/cmd/util/output/backup_structured_describer.go @@ -31,7 +31,6 @@ import ( "github.com/vmware-tanzu/velero/internal/volume" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" - "github.com/vmware-tanzu/velero/pkg/features" "github.com/vmware-tanzu/velero/pkg/util/boolptr" "github.com/vmware-tanzu/velero/pkg/util/results" ) @@ -386,10 +385,6 @@ func describNativeSnapshotInSF(details bool, info *volume.VolumeInfo, snapshotDe } func describeCSISnapshotsInSF(details bool, infos []*volume.VolumeInfo, backupVolumes map[string]interface{}, legacyInfoSource bool) { - if !features.IsEnabled(velerov1api.CSIFeatureFlag) { - return - } - if len(infos) == 0 { if legacyInfoSource { backupVolumes["csiSnapshots"] = "" diff --git a/pkg/cmd/util/output/backup_structured_describer_test.go b/pkg/cmd/util/output/backup_structured_describer_test.go index 4dcadacd9..2f65934f7 100644 --- a/pkg/cmd/util/output/backup_structured_describer_test.go +++ b/pkg/cmd/util/output/backup_structured_describer_test.go @@ -10,7 +10,6 @@ import ( v1 "k8s.io/api/core/v1" "github.com/vmware-tanzu/velero/internal/volume" - "github.com/vmware-tanzu/velero/pkg/features" "github.com/vmware-tanzu/velero/pkg/util/results" "github.com/stretchr/testify/assert" @@ -331,11 +330,6 @@ func TestDescribeNativeSnapshotsInSF(t *testing.T) { } func TestDescribeCSISnapshotsInSF(t *testing.T) { - features.Enable(velerov1api.CSIFeatureFlag) - defer func() { - features.Disable(velerov1api.CSIFeatureFlag) - }() - testcases := []struct { name string volumeInfo []*volume.VolumeInfo diff --git a/site/content/docs/main/customize-installation.md b/site/content/docs/main/customize-installation.md index 6a069ea87..aac8604d2 100644 --- a/site/content/docs/main/customize-installation.md +++ b/site/content/docs/main/customize-installation.md @@ -67,7 +67,7 @@ $ kubectl -n velero edit daemonset/node-agent For some features it may be necessary to use the `--features` flag to the Velero client. This may be done by passing the `--features` on every command run using the Velero CLI or the by setting the features in the velero client config file using the `velero client config set` command as shown below: ```bash -velero client config set features=EnableCSI +velero client config set features=feature1,feature2... ``` This stores the config in a file at `$HOME/.config/velero/config.json`.