From bed61ecc953e6c2fac45f66ef394a69796f0d3b9 Mon Sep 17 00:00:00 2001 From: Malay Kumar Parida Date: Thu, 17 Oct 2024 17:50:24 +0530 Subject: [PATCH] Add missing vendor changes Signed-off-by: Malay Kumar Parida --- .../v4/controllers/util/csi_options.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/v4/controllers/util/csi_options.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/v4/controllers/util/csi_options.go index 98055a2af0..34b78feab7 100644 --- a/metrics/vendor/github.com/red-hat-storage/ocs-operator/v4/controllers/util/csi_options.go +++ b/metrics/vendor/github.com/red-hat-storage/ocs-operator/v4/controllers/util/csi_options.go @@ -13,22 +13,7 @@ func GetCephFSKernelMountOptions(sc *ocsv1.StorageCluster) string { return "ms_mode=secure" } - // If Encryption is not enabled, but Compression or RequireMsgr2 is enabled, use prefer-crc mode - if sc.Spec.Network != nil && sc.Spec.Network.Connections != nil && - ((sc.Spec.Network.Connections.Compression != nil && sc.Spec.Network.Connections.Compression.Enabled) || - sc.Spec.Network.Connections.RequireMsgr2) { - return "ms_mode=prefer-crc" - } - - // Network spec always has higher precedence even in the External or Provider cluster. so they are checked first above - - // None of Encryption, Compression, RequireMsgr2 are enabled on the StorageCluster - // If it's an External or Provider cluster, We don't require msgr2 by default so no mount options are needed - if sc.Spec.ExternalStorage.Enable || sc.Spec.AllowRemoteStorageConsumers { - return "ms_mode=legacy" - } - // If none of the above cases apply, We set RequireMsgr2 true by default on the cephcluster - // so we need to set the mount options to prefer-crc + // If encryption is not enabled, use prefer-crc mode return "ms_mode=prefer-crc" }