github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Handle returned error as placeholder variables for now

Browse Source
This commit is contained in:
Hemant Kumar 2025-02-24 16:21:11 -05:00
parent fbce6bd610
commit f7c1799297
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/emptydir/empty_dir.go
View File

@ -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 := 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. // 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 // We'll use the old du mechanism in this case, at least until we support

3
pkg/volume/fc/disk_manager.go
View File

@ -92,7 +92,8 @@ func diskSetUp(manager diskManager, b fcDiskMounter, volPath string, mounter mou
if !b.readOnly { if !b.readOnly {
ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil)) ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil))
ownershipChanger.ChangePermissions() // TODO: Handle error returned here properly.
_ = ownershipChanger.ChangePermissions()
} }
return nil return nil

2
pkg/volume/flexvolume/mounter.go
View File

@ -96,7 +96,7 @@ func (f *flexVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArgs)
if f.plugin.capabilities.FSGroup { if f.plugin.capabilities.FSGroup {
// fullPluginName helps to distinguish different driver from flex volume plugin // 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 := volume.NewVolumeOwnership(f, dir, mounterArgs.FsGroup, mounterArgs.FSGroupChangePolicy, util.FSGroupCompleteHook(f.plugin, f.spec))
ownershipChanger.ChangePermissions() _ = ownershipChanger.ChangePermissions()
} }
} }

3
pkg/volume/git_repo/git_repo.go
View File

@ -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 := 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()) volumeutil.SetReady(b.getMetaDir())
return nil return nil
} }

2
pkg/volume/iscsi/disk_manager.go
View File

@ -99,7 +99,7 @@ func diskSetUp(manager diskManager, b iscsiDiskMounter, volPath string, mounter
if !b.readOnly { if !b.readOnly {
// This code requires larger refactor to monitor progress of ownership change // This code requires larger refactor to monitor progress of ownership change
ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil)) ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil))
ownershipChanger.ChangePermissions() _ = ownershipChanger.ChangePermissions()
} }
return nil return nil

2
pkg/volume/portworx/portworx.go
View File

@ -333,7 +333,7 @@ func (b *portworxVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterAr
if !b.readOnly { 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 // 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 := 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) klog.Infof("Portworx Volume %s setup at %s", b.volumeID, dir)
return nil return nil