From f3d2f340d8f7b892d06625c3b42132bbc91998e9 Mon Sep 17 00:00:00 2001 From: Vikas Kumar Date: Mon, 6 May 2024 05:43:19 +0000 Subject: [PATCH] Revert "Merge pull request #360 from portworx/PB-6687" This reverts commit 2d70102900d4f463ec30bd0769e346a821785cfe, reversing changes made to 31782fe27ac10847869ccb2b9ee6d41d548a262a. --- .gitignore | 2 -- pkg/executor/nfs/nfsrestorevolcreate.go | 5 ----- 2 files changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index a4b769bae..c62067826 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,3 @@ /bin profile.out coverage.txt -.vscode/ -.idea/ \ No newline at end of file diff --git a/pkg/executor/nfs/nfsrestorevolcreate.go b/pkg/executor/nfs/nfsrestorevolcreate.go index 806c94312..55f86781d 100644 --- a/pkg/executor/nfs/nfsrestorevolcreate.go +++ b/pkg/executor/nfs/nfsrestorevolcreate.go @@ -135,11 +135,6 @@ func restoreVolResourcesAndApply( if volumeBackup.Namespace != namespace { continue } - - // TODO: Skip portworx volumes in case of nfsRestore PB:6687 - if driverName == "pxd" { - continue - } // If a list of resources was specified during restore check if // this PVC was included info.Name = volumeBackup.PersistentVolumeClaim