Summary of Changes:

Move PVC Request Size Patch to Backup CSI Action
Shifted the logic that patches the PVC request size (to match the corresponding VolumeSnapshot size) from the CSI Restore action to the CSI Backup action.
✅ This enables restoring a PVC independently using label selectors, without requiring the VolumeSnapshot to be restored first.

Include VolumeSnapshot in CSI Additional Items for PVC
Added VolumeSnapshot as an additional item in the PVC CSI backup logic to ensure necessary metadata is available during restore.

Include VolumeSnapshotContent in CSI Restore Additional Items
Added VolumeSnapshotContent to the additional items in the CSI restore action to support a more complete restore workflow.
✅ This to make sure those resources are restored even if filters out by label from the resources list to restore

Signed-off-by: Amos Mastbaum <[email protected]>

Author: sseago

Dockerfile.ubi

@@ -10,7 +10,6 @@ COPY . /go/src/github.com/vmware-tanzu/velero
 WORKDIR /go/src/github.com/vmware-tanzu/velero
 
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=konveyor-dev' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-restore-helper github.com/vmware-tanzu/velero/cmd/velero-restore-helper
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-helper github.com/vmware-tanzu/velero/cmd/velero-helper
 
 FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS restic-builder
@@ -31,7 +30,6 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=
 FROM registry.access.redhat.com/ubi9-minimal
 RUN microdnf -y update && microdnf -y install nmap-ncat && microdnf -y reinstall tzdata && microdnf clean all
 COPY --from=builder /go/src/velero velero
-COPY --from=builder /go/src/velero-restore-helper velero-restore-helper
 COPY --from=builder /go/src/velero-helper velero-helper
 COPY --from=restic-builder /opt/app-root/src/restic /usr/bin/restic
 
@@ -41,4 +39,4 @@ RUN chmod -R 777 /home/velero
 USER 65534:65534
 ENV HOME=/home/velero
 
-ENTRYPOINT ["/velero"]
+ENTRYPOINT ["/velero"]

pkg/restore/actions/csi/pvc_action.go

@@ -114,7 +114,6 @@ func (p *pvcRestoreItemAction) Execute(
 		pvc.Spec.DataSource = nil
 		pvc.Spec.DataSourceRef = nil
 	} else {
-
 		backup := new(velerov1api.Backup)
 		err := p.crClient.Get(
 			context.TODO(),
@@ -131,7 +130,6 @@ func (p *pvcRestoreItemAction) Execute(
 		}
 
 		if boolptr.IsSetToTrue(backup.Spec.SnapshotMoveData) {
-
 			logger.Info("Start DataMover restore.")
 
 			// If PVC doesn't have a DataUploadNameLabel, which should be created