Merge pull request #2975 from iamniting/configmap

set ROOK_CSI_ENABLE_CEPHFS in the ocs-operator-config configmap

controllers/ocsinitialization/ocsinitialization_controller.go

@@ -506,12 +506,19 @@ func (r *OCSInitializationReconciler) ensureOcsOperatorConfigExists(initialData
 		return sc.Spec.AllowRemoteStorageConsumers
 	})
 
+	enableCephfsVal, err := r.getEnableCephfsKeyValue()
+	if err != nil {
+		r.Log.Error(err, "Failed to get enableCephfsKeyValue")
+		return err
+	}
+
 	ocsOperatorConfigData := map[string]string{
 		util.ClusterNameKey:              util.GetClusterID(r.ctx, r.Client, &r.Log),
 		util.RookCurrentNamespaceOnlyKey: strconv.FormatBool(!(len(r.clusters.GetStorageClusters()) > 1)),
 		util.EnableTopologyKey:           r.getEnableTopologyKeyValue(),
 		util.TopologyDomainLabelsKey:     r.getTopologyDomainLabelsKeyValue(),
 		util.EnableNFSKey:                r.getEnableNFSKeyValue(),
+		util.EnableCephfsKey:             enableCephfsVal,
 		util.DisableCSIDriverKey:         strconv.FormatBool(allowConsumers),
 	}
 
@@ -603,6 +610,24 @@ func (r *OCSInitializationReconciler) getEnableNFSKeyValue() string {
 	return "false"
 }
 
+func (r *OCSInitializationReconciler) getEnableCephfsKeyValue() (string, error) {
+
+	// list all storage classes and check if any of them is using cephfs
+	storageClasses := &storagev1.StorageClassList{}
+	if err := r.Client.List(r.ctx, storageClasses); err != nil {
+		r.Log.Error(err, "Failed to list storage classes")
+		return "", err
+	}
+
+	for _, sc := range storageClasses.Items {
+		if strings.HasSuffix(sc.Provisioner, "cephfs.csi.ceph.com") {
+			return "true", nil
+		}
+	}
+
+	return "false", nil
+}
+
 func getFailureDomainKeyFromStorageClassParameter(sc *storagev1.StorageClass) string {
 	failuredomain := sc.Parameters["topologyFailureDomainLabel"]
 	if failuredomain == "zone" {

controllers/ocsinitialization/ocsinitialization_controller_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
 	extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -120,6 +121,11 @@ func createFakeScheme(t *testing.T) *runtime.Scheme {
 		assert.Fail(t, "failed to add extensionsv1 scheme")
 	}
 
+	err = storagev1.AddToScheme(scheme)
+	if err != nil {
+		assert.Fail(t, "failed to add storagev1 scheme")
+	}
+
 	return scheme
 }
 

controllers/util/k8sutil.go

@@ -48,6 +48,7 @@ const (
 	TopologyDomainLabelsKey     = "CSI_TOPOLOGY_DOMAIN_LABELS"
 	EnableNFSKey                = "ROOK_CSI_ENABLE_NFS"
 	DisableCSIDriverKey         = "ROOK_CSI_DISABLE_DRIVER"
+	EnableCephfsKey             = "ROOK_CSI_ENABLE_CEPHFS"
 
 	// This is the name for the FieldIndex
 	OwnerUIDIndexName   = "ownerUID"