Skip to content

fix: fix debug-level propogation #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jimlindeman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: fix debug-level propogation #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion provisioner/ibm-s3fs-provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions provisioner/ibm-s3fs-provisioner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down