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.

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

Fix Portworx CSI storage capabilities #2789

Merged
merged 1 commit into from
Sep 5, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/storagecapabilities/storagecapabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ var CapabilitiesByProvisionerKey = map[string][]StorageCapabilities{
"kubernetes.io/portworx-volume": {{rwo, file}},
// Portworx CSI
"pxd.openstorage.org/shared": createOpenStorageSharedVolumeCapabilities(),
"pxd.openstorage.org": createRWOBlockAndFilesystemCapabilities(),
"pxd.openstorage.org": createOpenStorageSharedVolumeCapabilities(),
"pxd.portworx.com/shared": createOpenStorageSharedVolumeCapabilities(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed that we are saying RWX/Block is supported but https://github.com/libopenstorage/openstorage/blob/master/csi/controller.go#L408-L412 begs to differ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we may need to revamp and correct the portworx caps and backport to previous releases too.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so the code impliciltly says RWX/File,RWO/Block,RWO/File are supported in the shared provisioners?

"pxd.portworx.com": createRWOBlockAndFilesystemCapabilities(),
"pxd.portworx.com": createOpenStorageSharedVolumeCapabilities(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created DVs on pxd.portworx.com - all these Succeeded: {RWX, FS}, {RWO, Block}, {RWO, FS}

// Trident
"csi.trident.netapp.io/ontap-nas": {{rwx, file}},
"csi.trident.netapp.io/ontap-san": {{rwo, block}},
Expand Down Expand Up @@ -297,7 +297,8 @@ func createTopoLVMCapabilities() []StorageCapabilities {

func createOpenStorageSharedVolumeCapabilities() []StorageCapabilities {
return []StorageCapabilities{
{rwx, block},
{rwx, file},
{rwo, block},
{rwo, file},
}
}
Expand Down