admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get storage capapbility from provioner capability first

Browse Source 
Signed-off-by: zhangmin <arminzhang@yunify.com>
This commit is contained in:
zhangmin
2020-07-28 11:15:57 +08:00
parent afcd0efea2
commit a87892f901
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/controller/storage/capability/capability_controller.go
View File

@@ -378,7 +378,7 @@ func (c *StorageCapabilityController) deleteSnapshotClass(name string) error {
return c.snapshotClassClient.Delete(name, &metav1.DeleteOptions{})
}
func (c *StorageCapabilityController) nonCSICapability(provisioner string) (*capability.StorageClassCapabilitySpec, error) {
func (c *StorageCapabilityController) capabilityFromProvisioner(provisioner string) (*capability.StorageClassCapabilitySpec, error) {
provisionerCapability, err := c.provisionerCapabilityLister.Get(getProvisionerCapabilityName(provisioner))
if err != nil {
if errors.IsNotFound(err) {
@@ -386,6 +386,7 @@ func (c *StorageCapabilityController) nonCSICapability(provisioner string) (*cap
}
return nil, err
}
klog.V(4).Infof("get provisioner capability:%s %v", provisioner, provisionerCapability)
capabilitySpec := &capability.StorageClassCapabilitySpec{
Features: provisionerCapability.Spec.Features,
}
@@ -393,19 +394,25 @@ func (c *StorageCapabilityController) nonCSICapability(provisioner string) (*cap
}
func (c *StorageCapabilityController) getCapabilitySpec(storageClass *storagev1.StorageClass) (*capability.StorageClassCapabilitySpec, error) {
isCsi, err := c.isCSIStorage(storageClass.Provisioner)
// get from provisioner capability first
klog.V(4).Info("get cap ", storageClass.Provisioner)
capabilitySpec, err := c.capabilityFromProvisioner(storageClass.Provisioner)
if err != nil {
return nil, err
}
var capabilitySpec *capability.StorageClassCapabilitySpec
if isCsi {
capabilitySpec, err = csiCapability(c.csiAddressGetter(storageClass.Provisioner))
} else {
capabilitySpec, err = c.nonCSICapability(storageClass.Provisioner)
}
if err != nil {
return nil, err
// csi of storage capability
if capabilitySpec == nil {
isCsi, err := c.isCSIStorage(storageClass.Provisioner)
if err != nil {
return nil, err
}
if isCsi {
capabilitySpec, err = csiCapability(c.csiAddressGetter(storageClass.Provisioner))
if err != nil {
return nil, err
}
}
}
if capabilitySpec != nil {