From aa46f93efa1881782e9b4b3941e6f326a50cae81 Mon Sep 17 00:00:00 2001 From: Niladri Halder Date: Fri, 30 Apr 2021 06:47:43 +0530 Subject: [PATCH] Changed if condition order Signed-off-by: Niladri Halder --- cmd/provisioner-localpv/app/provisioner.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/provisioner-localpv/app/provisioner.go b/cmd/provisioner-localpv/app/provisioner.go index 46bb3e89..14b8192a 100644 --- a/cmd/provisioner-localpv/app/provisioner.go +++ b/cmd/provisioner-localpv/app/provisioner.go @@ -124,15 +124,21 @@ func (p *Provisioner) Provision(opts pvController.ProvisionOptions) (*v1.Persist size = pvc.Spec.Resources.Requests["storage"] } sendEventOrIgnore(pvc.Name, name, size.String(), stgType, analytics.VolumeProvision) - if stgType == "hostpath" { - return p.ProvisionHostPath(opts, pvCASConfig) - } + + // StorageType: Device if stgType == "device" { return p.ProvisionBlockDevice(opts, pvCASConfig) } + + // EXCEPTION: Block VolumeMode if *opts.PVC.Spec.VolumeMode == v1.PersistentVolumeBlock && stgType != "device" { return nil, fmt.Errorf("PV with BlockMode is not supported with StorageType %v", stgType) } + + // StorageType: Hostpath + if stgType == "hostpath" { + return p.ProvisionHostPath(opts, pvCASConfig) + } alertlog.Logger.Errorw("", "eventcode", "local.pv.provision.failure", "msg", "Failed to provision Local PV",