opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8044 from Luap99/fix-8040

Browse Source 
Always add the dnsname plugin to the config for rootless
This commit is contained in:
OpenShift Merge Robot
2020-10-18 04:37:13 -04:00
committed by GitHub
parent 39f1bea46d 0fd5437904
commit 6ec96dc009
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/network/create.go
View File

@ -10,6 +10,7 @@ import (
"github.com/containernetworking/cni/pkg/version" "github.com/containernetworking/cni/pkg/version"
"github.com/containers/podman/v2/libpod" "github.com/containers/podman/v2/libpod"
"github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/podman/v2/pkg/domain/entities"
"github.com/containers/podman/v2/pkg/rootless"
"github.com/containers/podman/v2/pkg/util" "github.com/containers/podman/v2/pkg/util"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -131,8 +132,9 @@ func createBridge(r *libpod.Runtime, name string, options entities.NetworkCreate
plugins = append(plugins, bridge) plugins = append(plugins, bridge)
plugins = append(plugins, NewPortMapPlugin()) plugins = append(plugins, NewPortMapPlugin())
plugins = append(plugins, NewFirewallPlugin()) plugins = append(plugins, NewFirewallPlugin())
// if we find the dnsname plugin, we add configuration for it // if we find the dnsname plugin or are rootless, we add configuration for it
if HasDNSNamePlugin(runtimeConfig.Network.CNIPluginDirs) && !options.DisableDNS { // the rootless-cni-infra container has the dnsname plugin always installed
if (HasDNSNamePlugin(runtimeConfig.Network.CNIPluginDirs) || rootless.IsRootless()) && !options.DisableDNS {
// Note: in the future we might like to allow for dynamic domain names // Note: in the future we might like to allow for dynamic domain names
plugins = append(plugins, NewDNSNamePlugin(DefaultPodmanDomainName)) plugins = append(plugins, NewDNSNamePlugin(DefaultPodmanDomainName))
} }