Merge pull request #370 from portworx/PB-6903

PB-6903: Fix Cloud Native Restore Path
portworx · May 7, 2024 · 471fc1b · 471fc1b
2 parents d8681a0 + 9949f66
commit 471fc1b
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
 	github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc7
-	github.com/libopenstorage/stork v1.4.1-0.20240502172400-885982c36058
+	github.com/libopenstorage/stork v1.4.1-0.20240506185157-275e4369d062
 	github.com/portworx/pxc v0.33.0
 	github.com/portworx/sched-ops v1.20.4-rc1.0.20240424153814-f3083bdb4578
 	github.com/sirupsen/logrus v1.9.3

diff --git a/go.sum b/go.sum
@@ -3362,8 +3362,8 @@ github.com/libopenstorage/stork v1.4.1-0.20230502135851-9cacb19e1df5/go.mod h1:R
 github.com/libopenstorage/stork v1.4.1-0.20230519043154-cbc10dffaf19/go.mod h1:Xm4DHoViynFXMQKBXGj3IkA77LY2RBFkNtv6vbo3wNw=
 github.com/libopenstorage/stork v1.4.1-0.20230601053837-5dd68f026569/go.mod h1:+mKPMCPNhS/XOF2RPcNFijkr67CCCWp0o8OXVG6xxAk=
 github.com/libopenstorage/stork v1.4.1-0.20230610103146-72cf75320066/go.mod h1:Yst+fnOYjWk6SA5pXZBKm19wtiinjxQ/vgYTXI3k80Q=
-github.com/libopenstorage/stork v1.4.1-0.20240502172400-885982c36058 h1:bjV6pxioNGTmK900pwF9UQ2Te5ov1lsoH+1jha9dFWg=
-github.com/libopenstorage/stork v1.4.1-0.20240502172400-885982c36058/go.mod h1:kp5qtpq+BgjL5WqiOpDvbPH1WGReO5AaqXDbb+XpvzM=
+github.com/libopenstorage/stork v1.4.1-0.20240506185157-275e4369d062 h1:wTiDcrROzCHYsyYfromjatlOwT4UWZSeKqjOcg/SlKY=
+github.com/libopenstorage/stork v1.4.1-0.20240506185157-275e4369d062/go.mod h1:kp5qtpq+BgjL5WqiOpDvbPH1WGReO5AaqXDbb+XpvzM=
 github.com/libopenstorage/systemutils v0.0.0-20160208220149-44ac83be3ce1/go.mod h1:xwNGC7xiz/BQ/wbMkvHujL8Gjgseg+x41xMek7sKRRQ=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=

diff --git a/pkg/executor/nfs/nfsrestoreresources.go b/pkg/executor/nfs/nfsrestoreresources.go
@@ -384,7 +384,7 @@ func getPVCToPVMapping(allObjects []runtime.Unstructured) (map[string]*v1.Persis
 }
 
 func isGenericCSIPersistentVolume(pv *v1.PersistentVolume) (bool, error) {
-	driverName, err := volume.GetPVDriver(pv)
+	driverName, err := volume.GetPVDriverForRestore(pv)
 	if err != nil {
 		return false, err
 	}

diff --git a/vendor/github.com/libopenstorage/stork/drivers/volume/volume.go b/vendor/github.com/libopenstorage/stork/drivers/volume/volume.go
diff --git a/...r/github.com/libopenstorage/stork/pkg/applicationmanager/controllers/applicationbackup.go b/...r/github.com/libopenstorage/stork/pkg/applicationmanager/controllers/applicationbackup.go
diff --git a/.../github.com/libopenstorage/stork/pkg/applicationmanager/controllers/applicationrestore.go b/.../github.com/libopenstorage/stork/pkg/applicationmanager/controllers/applicationrestore.go
diff --git a/vendor/github.com/libopenstorage/stork/pkg/resourcecollector/persistentvolume.go b/vendor/github.com/libopenstorage/stork/pkg/resourcecollector/persistentvolume.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -441,7 +441,7 @@ github.com/libopenstorage/openstorage-sdk-clients/sdk/golang
 github.com/libopenstorage/secrets
 github.com/libopenstorage/secrets/aws/credentials
 github.com/libopenstorage/secrets/k8s
-# github.com/libopenstorage/stork v1.4.1-0.20240502172400-885982c36058
+# github.com/libopenstorage/stork v1.4.1-0.20240506185157-275e4369d062
 ## explicit; go 1.21
 github.com/libopenstorage/stork/drivers
 github.com/libopenstorage/stork/drivers/volume