Merge pull request #5880 from Madhu-1/fix-csi-ver

ceph: skip csi version detect if allowunsupported is set

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 {

pkg/operator/ceph/csi/spec.go

@@ -627,10 +627,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)