diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-25 17:35:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 17:35:52 +0100 |
| commit | cd62d372e5195e553abb8d0e4b05c726cb488b02 (patch) | |
| tree | 757af6be01afe55b05399f520b8a71294be162b7 /libpod | |
| parent | b4b78382cd813449497157550a7b0f66adecef91 (diff) | |
| parent | 393a8f02612518e9715669d1cf2d7ceb101f5079 (diff) | |
| download | podman-cd62d372e5195e553abb8d0e4b05c726cb488b02.tar.gz podman-cd62d372e5195e553abb8d0e4b05c726cb488b02.tar.bz2 podman-cd62d372e5195e553abb8d0e4b05c726cb488b02.zip | |
Merge pull request #9057 from baude/dnsnameinternal
disable dnsname when --internal
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/network/create.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libpod/network/create.go b/libpod/network/create.go index e7f65358b..a8f985af9 100644 --- a/libpod/network/create.go +++ b/libpod/network/create.go @@ -14,6 +14,7 @@ import ( "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) // Create the CNI network @@ -226,8 +227,12 @@ func createBridge(name string, options entities.NetworkCreateOptions, runtimeCon // if we find the dnsname plugin or are rootless, we add configuration for it // 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 - plugins = append(plugins, NewDNSNamePlugin(DefaultPodmanDomainName)) + if options.Internal { + logrus.Warnf("dnsname and --internal networks are incompatible. dnsname plugin not configured for network %s", name) + } else { + // Note: in the future we might like to allow for dynamic domain names + plugins = append(plugins, NewDNSNamePlugin(DefaultPodmanDomainName)) + } } ncList["plugins"] = plugins b, err := json.MarshalIndent(ncList, "", " ") |