Merge pull request #40 from jparrill/OCPBUGS-55469

openshift-merge-bot[bot] · web-flow · commit e4f744d35ae0 · 2025-04-30T15:14:42.000Z
OCPBUGS-55469: Removed hardcoded namespace in favor of backup.Namespace
diff --git a/pkg/common/utils.go b/pkg/common/utils.go
@@ -88,7 +88,7 @@ func WaitForDataUpload(ctx context.Context, client crclient.Client, log logrus.F
 	err := wait.PollUntilContextCancel(waitCtx, dataUploadCheckPace*time.Second, true, func(ctx context.Context) (bool, error) {
 		dataUploadSlice := &veleroapiv2alpha1.DataUploadList{}
 		log.Info("waiting for dataUpload to be completed...")
-		if err := client.List(ctx, dataUploadSlice, crclient.InNamespace("openshift-adp")); err != nil {
+		if err := client.List(ctx, dataUploadSlice, crclient.InNamespace(backup.Namespace)); err != nil {
 			log.Error(err, "failed to get dataUploadList")
 			return false, err
 		}
@@ -175,7 +175,7 @@ func WaitForPodVolumeBackup(ctx context.Context, client crclient.Client, log log
 	}
 
 	podVolumeBackupList := &veleroapiv1.PodVolumeBackupList{}
-	if err := client.List(ctx, podVolumeBackupList, crclient.InNamespace("openshift-adp")); err != nil {
+	if err := client.List(ctx, podVolumeBackupList, crclient.InNamespace(backup.Namespace)); err != nil {
 		log.Error(err, "failed to get PodVolumeBackupList")
 		return false, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func WaitForDataUpload(ctx context.Context, client crclient.Client, log logrus.F`
`88`	`88`	`err := wait.PollUntilContextCancel(waitCtx, dataUploadCheckPace*time.Second, true, func(ctx context.Context) (bool, error) {`
`89`	`89`	`dataUploadSlice := &veleroapiv2alpha1.DataUploadList{}`
`90`	`90`	`log.Info("waiting for dataUpload to be completed...")`
`91`		`- if err := client.List(ctx, dataUploadSlice, crclient.InNamespace("openshift-adp")); err != nil {`
	`91`	`+ if err := client.List(ctx, dataUploadSlice, crclient.InNamespace(backup.Namespace)); err != nil {`
`92`	`92`	`log.Error(err, "failed to get dataUploadList")`
`93`	`93`	`return false, err`
`94`	`94`	`}`
`@@ -175,7 +175,7 @@ func WaitForPodVolumeBackup(ctx context.Context, client crclient.Client, log log`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`podVolumeBackupList := &veleroapiv1.PodVolumeBackupList{}`
`178`		`- if err := client.List(ctx, podVolumeBackupList, crclient.InNamespace("openshift-adp")); err != nil {`
	`178`	`+ if err := client.List(ctx, podVolumeBackupList, crclient.InNamespace(backup.Namespace)); err != nil {`
`179`	`179`	`log.Error(err, "failed to get PodVolumeBackupList")`
`180`	`180`	`return false, err`
`181`	`181`	`}`