From 51d3a52c8078f8c621edaf11e7d0558f0903f4f4 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 23 Jul 2020 08:30:14 +0530 Subject: [PATCH] ceph: skip csi version detect if allowunsupported is set If the AllowUnsupported flag is set to true we should not check the csi version as it will be kind of no-op as even incase of failure we continue. if we disable the version check in this case,the deployment will be little faster as we dont wait for version check to complete to start CSI pods. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/csi/csi.go | 10 +++++++--- pkg/operator/ceph/csi/spec.go | 4 ---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/operator/ceph/csi/csi.go b/pkg/operator/ceph/csi/csi.go index a207619ec..b0a58cd3d 100644 --- a/pkg/operator/ceph/csi/csi.go +++ b/pkg/operator/ceph/csi/csi.go @@ -28,9 +28,13 @@ import ( ) func ValidateAndConfigureDrivers(clientset kubernetes.Interface, namespace, rookImage, securityAccount string, serverVersion *version.Info, ownerRef *metav1.OwnerReference) { - if err := validateCSIVersion(clientset, namespace, rookImage, securityAccount, ownerRef); err != nil { - logger.Errorf("invalid csi version. %+v", err) - return + if !AllowUnsupported { + if err := validateCSIVersion(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") } if err := startDrivers(clientset, namespace, serverVersion, ownerRef); err != nil { diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index d2f71f2a8..10f59b484 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -625,10 +625,6 @@ func validateCSIVersion(clientset kubernetes.Interface, namespace, rookImage, se version, err := extractCephCSIVersion(stdout) if err != nil { - if AllowUnsupported { - logger.Infof("failed to extract csi version, but continuing since unsupported versions are allowed. %v", err) - return nil - } return errors.Wrap(err, "failed to extract ceph CSI version") } logger.Infof("Detected ceph CSI image version: %q", version)