ceph: skip csi detection if CSI is disabled

Before this patch, csi detection will run whether or
not rbd and cephfs are all disabled. Run detection only
if it is necessary.

Signed-off-by: shenjiatong <yshxxsjt715@gmail.com>
This commit is contained in:
shenjiatong committed 2021-02-02 08:28:35 +08:00
1 parent ba91f5d7f8
commit 2b63fff087
1 file changed
+8 -5
+8 -5
View File
@@ -31,19 +31,22 @@ import (
func ValidateAndConfigureDrivers(context *clusterd.Context, namespace, rookImage, securityAccount string, serverVersion *version.Info, ownerRef *metav1.OwnerReference) {
var v *CephCSIVersion
var err error
if !AllowUnsupported {
if !AllowUnsupported && CSIEnabled() {
if v, err = validateCSIVersion(context.Clientset, namespace, rookImage, securityAccount, ownerRef); err != nil {
logger.Errorf("invalid csi version. %+v", err)
return
}
} else {
logger.Info("Skipping csi version check, since unsupported versions are allowed")
logger.Info("Skipping csi version check, since unsupported versions are allowed or csi is disabled")
}
if err := startDrivers(context.Clientset, context.RookClientset, namespace, serverVersion, ownerRef, v); err != nil {
logger.Errorf("failed to start Ceph csi drivers. %v", err)
return
if CSIEnabled() {
if err := startDrivers(context.Clientset, context.RookClientset, namespace, serverVersion, ownerRef, v); err != nil {
logger.Errorf("failed to start Ceph csi drivers. %v", err)
return
}
}
stopDrivers(context.Clientset, namespace, serverVersion)
}