From bb44fdf79c550bd0748bca790bfb6e7ab2a0eab8 Mon Sep 17 00:00:00 2001 From: James Lindeman Date: Mon, 30 Mar 2026 00:16:28 -0400 Subject: [PATCH] fix debug-level propogation Signed-off-by: Jim Lindeman --- provisioner/ibm-s3fs-provisioner.go | 6 +++++- provisioner/ibm-s3fs-provisioner_test.go | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/provisioner/ibm-s3fs-provisioner.go b/provisioner/ibm-s3fs-provisioner.go index e6cc642a..5fee696d 100644 --- a/provisioner/ibm-s3fs-provisioner.go +++ b/provisioner/ibm-s3fs-provisioner.go @@ -754,9 +754,13 @@ func (p *IBMS3fsProvisioner) Provision(ctx context.Context, options controller.P sc.UseXattr = pvc.UseXattr } - if pvc.DebugLevel != "" { + if pvc.DebugLevel != nil && pvc.DebugLevel != "" { sc.DebugLevel = pvc.DebugLevel } + if sc.DebugLevel == "" { + // Give a default of 'warn' vs. making s3fs-fuse error out with dbglevel="" + sc.DebugLevel = "warn" + } if pvc.CurlDebug { sc.CurlDebug = pvc.CurlDebug diff --git a/provisioner/ibm-s3fs-provisioner_test.go b/provisioner/ibm-s3fs-provisioner_test.go index e1c6261a..3221f1ba 100644 --- a/provisioner/ibm-s3fs-provisioner_test.go +++ b/provisioner/ibm-s3fs-provisioner_test.go @@ -1538,6 +1538,15 @@ func Test_Provision_PVCAnnotations_DebugLevel(t *testing.T) { assert.Equal(t, "info", pv.Spec.FlexVolume.Options[optionDebugLevel]) } +func Test_Provision_PVCAnnotations_Preserve_SC_DebugLevel(t *testing.T) { + p := getProvisioner() + v := getVolumeOptions() + v.StorageClass.Parameters["ibm.io/debug-level"] = "info" + pv, _, err := p.Provision(context.Background(), v) + assert.NoError(t, err) + assert.Equal(t, "info", pv.Spec.FlexVolume.Options[optionDebugLevel]) +} + func Test_Provision_PVCAnnotations_CurlDebug(t *testing.T) { p := getProvisioner() v := getVolumeOptions()