From 04d37dad704f55e8c63aaa6fecbb12cdfbb1d7ba Mon Sep 17 00:00:00 2001 From: MICHAEL S FRUCHTMAN Date: Tue, 25 Jun 2024 14:04:47 -0700 Subject: [PATCH] Fixed header conflict from 1.12.4 merge Signed-off-by: MICHAEL S FRUCHTMAN --- pkg/exposer/csi_snapshot.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/exposer/csi_snapshot.go b/pkg/exposer/csi_snapshot.go index f6e58ded5c..e698417426 100644 --- a/pkg/exposer/csi_snapshot.go +++ b/pkg/exposer/csi_snapshot.go @@ -32,17 +32,12 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/vmware-tanzu/velero/pkg/exposer/shallowprovisioner" "github.com/vmware-tanzu/velero/pkg/nodeagent" "github.com/vmware-tanzu/velero/pkg/util/boolptr" "github.com/vmware-tanzu/velero/pkg/util/csi" "github.com/vmware-tanzu/velero/pkg/util/kube" - shallowprovisioner "github.com/vmware-tanzu/velero/pkg/exposer/shallowprovisioner" - - snapshotter "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1" - "sigs.k8s.io/controller-runtime/pkg/client" - - apierrors "k8s.io/apimachinery/pkg/api/errors" ) // CSISnapshotExposeParam define the input param for Expose of CSI snapshots