Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ovirt csi to known provisioners #2661

Merged
merged 1 commit into from
Mar 23, 2023
Merged

Add ovirt csi to known provisioners #2661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 6 additions & 11 deletions pkg/storagecapabilities/storagecapabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,21 @@ var CapabilitiesByProvisionerKey = map[string][]StorageCapabilities{
"kubernetes.io/portworx-volume": {{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeFilesystem}},
// Portworx CSI
"pxd.openstorage.org/shared": createOpenStorageSharedVolumeCapabilities(),
"pxd.openstorage.org": createOpenStorageVolumeCapabilities(),
"pxd.openstorage.org": createRWOBlockAndFilesystemCapabilities(),
"pxd.portworx.com/shared": createOpenStorageSharedVolumeCapabilities(),
"pxd.portworx.com": createOpenStorageVolumeCapabilities(),
"pxd.portworx.com": createRWOBlockAndFilesystemCapabilities(),
// Trident
"csi.trident.netapp.io/ontap-nas": {{AccessMode: v1.ReadWriteMany, VolumeMode: v1.PersistentVolumeFilesystem}},
"csi.trident.netapp.io/ontap-san": {{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeBlock}},
// topolvm
"topolvm.cybozu.com": createTopoLVMCapabilities(),
"topolvm.io": createTopoLVMCapabilities(),
// OpenStack Cinder
"cinder.csi.openstack.org": createCinderVolumeCapabilities(),
"cinder.csi.openstack.org": createRWOBlockAndFilesystemCapabilities(),
// OpenStack manila
"manila.csi.openstack.org": {{AccessMode: v1.ReadWriteMany, VolumeMode: v1.PersistentVolumeFilesystem}},
// ovirt csi
"csi.ovirt.org": createRWOBlockAndFilesystemCapabilities(),
}

// ProvisionerNoobaa is the provisioner string for the Noobaa object bucket provisioner which does not work with CDI
Expand Down Expand Up @@ -228,21 +230,14 @@ func createTopoLVMCapabilities() []StorageCapabilities {
}
}

func createOpenStorageVolumeCapabilities() []StorageCapabilities {
return []StorageCapabilities{
{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeBlock},
{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeFilesystem},
}
}

func createOpenStorageSharedVolumeCapabilities() []StorageCapabilities {
return []StorageCapabilities{
{AccessMode: v1.ReadWriteMany, VolumeMode: v1.PersistentVolumeBlock},
{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeFilesystem},
}
}

func createCinderVolumeCapabilities() []StorageCapabilities {
func createRWOBlockAndFilesystemCapabilities() []StorageCapabilities {
return []StorageCapabilities{
{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeBlock},
{AccessMode: v1.ReadWriteOnce, VolumeMode: v1.PersistentVolumeFilesystem},
Expand Down