Skip pvb creation when pvc excluded

Signed-off-by: Shahaf Bahar <[email protected]>

changelogs/unreleased/7045-sbahar619

@@ -0,0 +1,2 @@
+FS backup create PodVolumeBackup when the backup excluded PVC, 
+so I added logic to skip PVC volume type when PVC is not included in the backup resources to be backed up.

pkg/backup/backup_test.go

@@ -3114,6 +3114,9 @@ func TestBackupWithPodVolume(t *testing.T) {
 						Volumes(builder.ForVolume("bar").PersistentVolumeClaimSource("pvc-1").Result()).
 						Result(),
 				),
+				test.PVCs(
+					builder.ForPersistentVolumeClaim("ns-1", "pvc-1").VolumeName("pv-1").Result(),
+				),
 			},
 			want: []*velerov1.PodVolumeBackup{
 				builder.ForPodVolumeBackup("velero", "pvb-ns-1-pod-1-foo").Volume("foo").Result(),
@@ -3135,6 +3138,9 @@ func TestBackupWithPodVolume(t *testing.T) {
 						Volumes(builder.ForVolume("bar").PersistentVolumeClaimSource("pvc-1").Result()).
 						Result(),
 				),
+				test.PVCs(
+					builder.ForPersistentVolumeClaim("ns-1", "pvc-1").VolumeName("pv-1").Result(),
+				),
 			},
 			want: []*velerov1.PodVolumeBackup{
 				builder.ForPodVolumeBackup("velero", "pvb-ns-1-pod-2-bar").Volume("bar").Result(),

pkg/backup/item_backupper.go

@@ -203,7 +203,24 @@ func (ib *itemBackupper) backupItemInternal(logger logrus.FieldLogger, obj runti
 			// any volumes that use a PVC that we've already backed up (this would be in a read-write-many scenario,
 			// where it's been backed up from another pod), since we don't need >1 backup per PVC.
 			includedVolumes, optedOutVolumes := pdvolumeutil.GetVolumesByPod(pod, boolptr.IsSetToTrue(ib.backupRequest.Spec.DefaultVolumesToFsBackup))
+		includedVolumesLoop:
 			for _, volume := range includedVolumes {
+				// Check if the PVC resource is not included in the backup
+				if !ib.backupRequest.ResourceIncludesExcludes.ShouldInclude(kuberesource.PersistentVolumeClaims.String()) {
+					// Search for the matched volume in the Pod
+					for _, podVolume := range pod.Spec.Volumes {
+						if podVolume.Name != volume {
+							continue
+						}
+						// Check if the volume is a PVC type
+						if podVolume.PersistentVolumeClaim != nil {
+							// Skip the volume and prevent PVB creation
+							log.Infof("Skipping volume %s because it's a %s type and this resource excluded in the backup.", volume, kuberesource.PersistentVolumeClaims.String())
+							continue includedVolumesLoop
+						}
+					}
+				}
+
 				// track the volumes that are PVCs using the PVC snapshot tracker, so that when we backup PVCs/PVs
 				// via an item action in the next step, we don't snapshot PVs that will have their data backed up
 				// with pod volume backup.