Merge pull request #189 from sushanthakumar/openebs-cleanup

Reusage of common csi snapshotter for open ebs provisioned volumes
soda-cdm · Feb 1, 2024 · 1e6b65a · 1e6b65a
2 parents baf3702 + db264f9
commit 1e6b65a
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 716 deletions.
diff --git a/build/lib/golang.sh b/build/lib/golang.sh
@@ -29,7 +29,6 @@ readonly KAHU_STATIC_BINARIES=(
   controller-manager
   meta-service
   volume-service
-  openebs-zfs
   csi-snapshotter
   nfs-provider
 )
@@ -41,7 +40,6 @@ golang::targets() {
     cmd/meta-service
     cmd/volume-service
     providers/nfs/nfs-provider
-    cmd/openebs-zfs
     cmd/csi-snapshotter
   )
   echo "${targets[@]}"

diff --git a/build/lib/release.sh b/build/lib/release.sh
@@ -38,7 +38,6 @@ build::get_docker_wrapped_binaries() {
     controller-manager
     meta-service
     volume-service
-    openebs-zfs
     csi-snapshotter
     nfs-provider
   )

diff --git a/cmd/openebs-zfs/main.go b/cmd/openebs-zfs/main.go
diff --git a/controllers/volumebackup/controller.go b/controllers/volumebackup/controller.go
@@ -51,7 +51,7 @@ const (
 )
 
 var volBackupSupport = map[string]string{
-	"zfs.csi.openebs.io":         "zfs.backup.openebs.io",
+	"zfs.csi.openebs.io":         "snapshotter.backup.csi.io",
 	"linstor.csi.linbit.com":     "snapshotter.backup.csi.io",
 	"cephfs.csi.ceph.com":        "snapshotter.backup.csi.io",
 	"hostpath.csi.k8s.io":        "snapshotter.backup.csi.io",

diff --git a/deploy/volumeprovider/openebs-zfs-provider-deployment.yaml b/deploy/volumeprovider/openebs-zfs-provider-deployment.yaml
diff --git a/providers/openebs-zfs/server/app.go b/providers/openebs-zfs/server/app.go