beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #41485 from thaJeztah/remove_dead_arg

Browse source
This commit is contained in:
Akihiro Suda 2021-02-27 22:25:00 +09:00 committed by GitHub
commit 22d7812836
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugin/manager_linux.go
View file

@ -217,7 +217,7 @@ func (pm *Manager) Shutdown() {
}
func (pm *Manager) upgradePlugin(p *v2.Plugin, configDigest, manifestDigest digest.Digest, blobsums []digest.Digest, tmpRootFSDir string, privileges *types.PluginPrivileges) (err error) {
config, err := pm.setupNewPlugin(configDigest, blobsums, privileges)
config, err := pm.setupNewPlugin(configDigest, privileges)
if err != nil {
return err
}
@ -269,7 +269,7 @@ func (pm *Manager) upgradePlugin(p *v2.Plugin, configDigest, manifestDigest dige
return errors.Wrap(err, "error saving upgraded plugin config")
}
func (pm *Manager) setupNewPlugin(configDigest digest.Digest, blobsums []digest.Digest, privileges *types.PluginPrivileges) (types.PluginConfig, error) {
func (pm *Manager) setupNewPlugin(configDigest digest.Digest, privileges *types.PluginPrivileges) (types.PluginConfig, error) {
configRA, err := pm.blobStore.ReaderAt(context.TODO(), specs.Descriptor{Digest: configDigest})
if err != nil {
return types.PluginConfig{}, err
@ -303,7 +303,7 @@ func (pm *Manager) createPlugin(name string, configDigest, manifestDigest digest
return nil, errdefs.InvalidParameter(err)
}
config, err := pm.setupNewPlugin(configDigest, blobsums, privileges)
config, err := pm.setupNewPlugin(configDigest, privileges)
if err != nil {
return nil, err
}