Merge pull request #4187 from baude/dnspluginenable

enable dnsplugin for network create

1 files changed, 9 insertions, 5 deletions

diff --git a/pkg/adapter/network.go b/pkg/adapter/network.go
index d407984ce..9659ae339 100644
--- a/pkg/adapter/network.go
+++ b/pkg/adapter/network.go
@@ -155,15 +155,14 @@ func (r *LocalRuntime) removeNetwork(ctx context.Context, name string, container
 
 // NetworkCreate creates a CNI network
 func (r *LocalRuntime) NetworkCreate(cli *cliconfig.NetworkCreateValues) (string, error) {
-	var (
-		err error
-	)
-
 	isGateway := true
 	ipMasq := true
 	subnet := &cli.Network
 	ipRange := cli.IPRange
-
+	runtimeConfig, err := r.GetConfig()
+	if err != nil {
+		return "", err
+	}
 	// if range is provided, make sure it is "in" network
 	if cli.IsSet("subnet") {
 		// if network is provided, does it conflict with existing CNI or live networks
@@ -245,6 +244,11 @@ func (r *LocalRuntime) NetworkCreate(cli *cliconfig.NetworkCreateValues) (string
 	plugins = append(plugins, bridge)
 	plugins = append(plugins, network.NewPortMapPlugin())
 	plugins = append(plugins, network.NewFirewallPlugin())
+	// if we find the dnsname plugin, we add configuration for it
+	if network.HasDNSNamePlugin(runtimeConfig.CNIPluginDir) && !cli.DisableDNS {
+		// Note: in the future we might like to allow for dynamic domain names
+		plugins = append(plugins, network.NewDNSNamePlugin(network.DefaultPodmanDomainName))
+	}
 	ncList["plugins"] = plugins
 	b, err := json.MarshalIndent(ncList, "", "   ")
 	if err != nil {