Skip to content

Commit f7c1799

Browse files
committed
Handle returned error as placeholder variables for now
1 parent fbce6bd commit f7c1799

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

pkg/volume/emptydir/empty_dir.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func (ed *emptyDir) SetUpAt(dir string, mounterArgs volume.MounterArgs) error {
280280
}
281281

282282
ownershipChanger := volume.NewVolumeOwnership(ed, dir, mounterArgs.FsGroup, nil /*fsGroupChangePolicy*/, volumeutil.FSGroupCompleteHook(ed.plugin, nil))
283-
ownershipChanger.ChangePermissions()
283+
_ = ownershipChanger.ChangePermissions()
284284

285285
// If setting up the quota fails, just log a message but don't actually error out.
286286
// We'll use the old du mechanism in this case, at least until we support

pkg/volume/fc/disk_manager.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ func diskSetUp(manager diskManager, b fcDiskMounter, volPath string, mounter mou
9292

9393
if !b.readOnly {
9494
ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil))
95-
ownershipChanger.ChangePermissions()
95+
// TODO: Handle error returned here properly.
96+
_ = ownershipChanger.ChangePermissions()
9697
}
9798

9899
return nil

pkg/volume/flexvolume/mounter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (f *flexVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArgs)
9696
if f.plugin.capabilities.FSGroup {
9797
// fullPluginName helps to distinguish different driver from flex volume plugin
9898
ownershipChanger := volume.NewVolumeOwnership(f, dir, mounterArgs.FsGroup, mounterArgs.FSGroupChangePolicy, util.FSGroupCompleteHook(f.plugin, f.spec))
99-
ownershipChanger.ChangePermissions()
99+
_ = ownershipChanger.ChangePermissions()
100100
}
101101
}
102102

pkg/volume/git_repo/git_repo.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ func (b *gitRepoVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArg
230230
}
231231

232232
ownershipChanger := volume.NewVolumeOwnership(b, dir, mounterArgs.FsGroup, nil /*fsGroupChangePolicy*/, volumeutil.FSGroupCompleteHook(b.plugin, nil))
233-
ownershipChanger.ChangePermissions()
233+
// We do not care about return value, this plugin is deprecated
234+
_ = ownershipChanger.ChangePermissions()
234235
volumeutil.SetReady(b.getMetaDir())
235236
return nil
236237
}

pkg/volume/iscsi/disk_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func diskSetUp(manager diskManager, b iscsiDiskMounter, volPath string, mounter
9999
if !b.readOnly {
100100
// This code requires larger refactor to monitor progress of ownership change
101101
ownershipChanger := volume.NewVolumeOwnership(&b, volPath, fsGroup, fsGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil))
102-
ownershipChanger.ChangePermissions()
102+
_ = ownershipChanger.ChangePermissions()
103103
}
104104

105105
return nil

pkg/volume/portworx/portworx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func (b *portworxVolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterAr
333333
if !b.readOnly {
334334
// Since portworxVolume is in process of being removed from in-tree, we avoid larger refactor to add progress tracking for ownership operation
335335
ownershipChanger := volume.NewVolumeOwnership(b, dir, mounterArgs.FsGroup, mounterArgs.FSGroupChangePolicy, util.FSGroupCompleteHook(b.plugin, nil))
336-
ownershipChanger.ChangePermissions()
336+
_ = ownershipChanger.ChangePermissions()
337337
}
338338
klog.Infof("Portworx Volume %s setup at %s", b.volumeID, dir)
339339
return nil

0 commit comments

Comments
 (0)