Merge pull request #26891 from allencloud/fix-26890-duplicate-overlay-drivers-in-info
fix #26890 avoid duplicate overlay drivers in info Upstream-commit: 8dc63675c547d0f29f03b1e0e042b8045245d02f Component: engine
This commit is contained in:
@@ -357,12 +357,14 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo
|
||||
// GetNetworkDriverList returns the list of plugins drivers
|
||||
// registered for network.
|
||||
func (daemon *Daemon) GetNetworkDriverList() []string {
|
||||
pluginList := []string{}
|
||||
pluginMap := make(map[string]bool)
|
||||
|
||||
if !daemon.NetworkControllerEnabled() {
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO: Replace this with proper libnetwork API
|
||||
pluginList := []string{"overlay"}
|
||||
pluginMap := map[string]bool{"overlay": true}
|
||||
|
||||
networks := daemon.netController.Networks()
|
||||
|
||||
for _, network := range networks {
|
||||
@@ -371,8 +373,6 @@ func (daemon *Daemon) GetNetworkDriverList() []string {
|
||||
pluginMap[network.Type()] = true
|
||||
}
|
||||
}
|
||||
// TODO : Replace this with proper libnetwork API
|
||||
pluginList = append(pluginList, "overlay")
|
||||
|
||||
sort.Strings(pluginList)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user