diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 16:11:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 16:11:14 -0400 |
| commit | 5f41ffdd194a828625b3bb6ec55ed87d2830fe58 (patch) | |
| tree | a625a713dc2205ac80122883f3532fc31bfb8fe2 /libpod/info.go | |
| parent | 505c9718cc717433780be8240250a247253ba34f (diff) | |
| parent | 5e8309464aea005fbc1604c304a94760aff4ee9a (diff) | |
| download | podman-5f41ffdd194a828625b3bb6ec55ed87d2830fe58.tar.gz podman-5f41ffdd194a828625b3bb6ec55ed87d2830fe58.tar.bz2 podman-5f41ffdd194a828625b3bb6ec55ed87d2830fe58.zip | |
Merge pull request #11322 from Luap99/network-libpod
Wire network interface into libpod
Diffstat (limited to 'libpod/info.go')
| -rw-r--r-- | libpod/info.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/info.go b/libpod/info.go index 7b60ee46f..36dc8bc2a 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -18,7 +18,6 @@ import ( "github.com/containers/image/v5/pkg/sysregistriesv2" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/linkmode" - "github.com/containers/podman/v3/libpod/network" "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/storage" @@ -73,8 +72,7 @@ func (r *Runtime) info() (*define.Info, error) { volumePlugins = append(volumePlugins, plugin) } info.Plugins.Volume = volumePlugins - // TODO move this into the new network interface - info.Plugins.Network = []string{network.BridgeNetworkDriver, network.MacVLANNetworkDriver} + info.Plugins.Network = r.network.Drivers() info.Plugins.Log = logDrivers info.Registries = registries |