From f7c179929735702a1e6d209837a67c76c182e88c Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Mon, 24 Feb 2025 16:21:11 -0500 Subject: [PATCH] Handle returned error as placeholder variables for now --- pkg/volume/emptydir/empty_dir.go | 2 +- pkg/volume/fc/disk_manager.go | 3 ++- pkg/volume/flexvolume/mounter.go | 2 +- pkg/volume/git_repo/git_repo.go | 3 ++- pkg/volume/iscsi/disk_manager.go | 2 +- pkg/volume/portworx/portworx.go | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/volume/emptydir/empty_dir.go b/pkg/volume/emptydir/empty_dir.go index 3c64e6af6d3..a9128f661fa 100644 --- a/pkg/volume/emptydir/empty_dir.go +++ b/pkg/volume/emptydir/empty_dir.go @@ -280,7 +280,7 @@ func (ed *emptyDir) SetUpAt(dir string, mounterArgs volume.MounterArgs) error { } ownershipChanger := volume.NewVolumeOwnership(ed, dir, mounterArgs.FsGroup, nil /*fsGroupChangePolicy*/, volumeutil.FSGroupCompleteHook(ed.plugin, nil)) - ownershipChanger.ChangePermissions() + _ = ownershipChanger.ChangePermissions() // If setting up the quota fails, just log a message but don't actually error out. // We'll use the old du mechanism in this case, at least until we support diff --git a/pkg/volume/fc/disk_manager.go b/pkg/volume/fc/disk_manager.go index 597d3c0a430..05b2df553ec 100644 --- a/pkg/volume/fc/disk_manager.go +++ b/pkg/volume/fc/disk_manager.go @@ -92,7 +92,8 @@ func diskSetUp(manager diskManager, b fcDiskMounter, volPath string, mounter mou if !b.readOnly { ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil)) - ownershipChanger.ChangePermissions() + // TODO: Handle error returned here properly. + _ = ownershipChanger.ChangePermissions() } return nil diff --git a/pkg/volume/flexvolume/mounter.go b/pkg/volume/flexvolume/mounter.go index cd8b4860bbc..6b240887641 100644 --- a/pkg/volume/flexvolume/mounter.go +++ b/pkg/volume/flexvolume/mounter.go @@ -96,7 +96,7 @@ func (f *flexVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArgs) if f.plugin.capabilities.FSGroup { // fullPluginName helps to distinguish different driver from flex volume plugin ownershipChanger := volume.NewVolumeOwnership(f, dir, mounterArgs.FsGroup, mounterArgs.FSGroupChangePolicy, util.FSGroupCompleteHook(f.plugin, f.spec)) - ownershipChanger.ChangePermissions() + _ = ownershipChanger.ChangePermissions() } } diff --git a/pkg/volume/git_repo/git_repo.go b/pkg/volume/git_repo/git_repo.go index ad37d6e8bdb..3a4bf850f58 100644 --- a/pkg/volume/git_repo/git_repo.go +++ b/pkg/volume/git_repo/git_repo.go @@ -230,7 +230,8 @@ func (b *gitRepoVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArg } ownershipChanger := volume.NewVolumeOwnership(b, dir, mounterArgs.FsGroup, nil /*fsGroupChangePolicy*/, volumeutil.FSGroupCompleteHook(b.plugin, nil)) - ownershipChanger.ChangePermissions() + // We do not care about return value, this plugin is deprecated + _ = ownershipChanger.ChangePermissions() volumeutil.SetReady(b.getMetaDir()) return nil } diff --git a/pkg/volume/iscsi/disk_manager.go b/pkg/volume/iscsi/disk_manager.go index 397bae22f71..4f4ff341e71 100644 --- a/pkg/volume/iscsi/disk_manager.go +++ b/pkg/volume/iscsi/disk_manager.go @@ -99,7 +99,7 @@ func diskSetUp(manager diskManager, b iscsiDiskMounter, volPath string, mounter if !b.readOnly { // This code requires larger refactor to monitor progress of ownership change ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil)) - ownershipChanger.ChangePermissions() + _ = ownershipChanger.ChangePermissions() } return nil diff --git a/pkg/volume/portworx/portworx.go b/pkg/volume/portworx/portworx.go index 496db552925..bc56928c517 100644 --- a/pkg/volume/portworx/portworx.go +++ b/pkg/volume/portworx/portworx.go @@ -333,7 +333,7 @@ func (b *portworxVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterAr if !b.readOnly { // Since portworxVolume is in process of being removed from in-tree, we avoid larger refactor to add progress tracking for ownership operation ownershipChanger := volume.NewVolumeOwnership(b, dir, mounterArgs.FsGroup, mounterArgs.FSGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil)) - ownershipChanger.ChangePermissions() + _ = ownershipChanger.ChangePermissions() } klog.Infof("Portworx Volume %s setup at %s", b.volumeID, dir) return nil