From ce59c72eb1d9edeb973ee3fefeb03ff4d7a38bdc Mon Sep 17 00:00:00 2001 From: Oded Viner Date: Sun, 18 May 2025 15:06:52 +0300 Subject: [PATCH] csi: enable CSI Metadata Injection by Default This PR sets CSI_ENABLE_METADATA to true by default in the Rook configuration, ensuring that the --setmetadata=true flag is added to CSI nodeplugin pods Signed-off-by: Oded Viner --- pkg/operator/ceph/csi/csi.go | 6 +++--- pkg/operator/ceph/csi/operator_config_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/operator/ceph/csi/csi.go b/pkg/operator/ceph/csi/csi.go index 231c5c041..49752f3a9 100644 --- a/pkg/operator/ceph/csi/csi.go +++ b/pkg/operator/ceph/csi/csi.go @@ -172,9 +172,9 @@ func (r *ReconcileCSI) setParams() error { CSIParam.EnableCSIEncryption = true } - CSIParam.CSIEnableMetadata = false - if strings.EqualFold(k8sutil.GetOperatorSetting("CSI_ENABLE_METADATA", "false"), "true") { - CSIParam.CSIEnableMetadata = true + CSIParam.CSIEnableMetadata = true + if strings.EqualFold(k8sutil.GetOperatorSetting("CSI_ENABLE_METADATA", "true"), "false") { + CSIParam.CSIEnableMetadata = false } if strings.EqualFold(k8sutil.GetOperatorSetting("CSI_CEPHFS_PLUGIN_UPDATE_STRATEGY", rollingUpdate), onDelete) { diff --git a/pkg/operator/ceph/csi/operator_config_test.go b/pkg/operator/ceph/csi/operator_config_test.go index a260a628f..7f16139a6 100644 --- a/pkg/operator/ceph/csi/operator_config_test.go +++ b/pkg/operator/ceph/csi/operator_config_test.go @@ -87,5 +87,5 @@ func TestReconcileCSI_createOrUpdateOperatorConfig(t *testing.T) { err = cl.Get(context.TODO(), types.NamespacedName{Name: opConfigCRName, Namespace: r.opConfig.OperatorNamespace}, opConfig) assert.NoError(t, err) - assert.Equal(t, *opConfig.Spec.DriverSpecDefaults.EnableMetadata, false) + assert.Equal(t, *opConfig.Spec.DriverSpecDefaults.EnableMetadata, true) }