diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 05:09:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 05:09:54 -0400 |
| commit | 8884f6a4f357ea64ad5f20f791ec0a09bdd36352 (patch) | |
| tree | a53c1994b7746b461a93b8ced9cb6157b249567b /pkg/domain | |
| parent | 90636fe8c2d1eb5ae75afa73405c8b12a0417fca (diff) | |
| parent | 426eccee63fc7add4b37a9c246cf83b08379cb62 (diff) | |
| download | podman-8884f6a4f357ea64ad5f20f791ec0a09bdd36352.tar.gz podman-8884f6a4f357ea64ad5f20f791ec0a09bdd36352.tar.bz2 podman-8884f6a4f357ea64ad5f20f791ec0a09bdd36352.zip | |
Merge pull request #5875 from rhatdan/network
Cleanup network option parsing
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/pods.go | 2 | ||||
| -rw-r--r-- | pkg/domain/entities/types.go | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 04673ef18..aa1445a6a 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -134,7 +134,7 @@ func (p PodCreateOptions) ToPodSpecGen(s *specgen.PodSpecGenerator) { s.StaticMAC = p.Net.StaticMAC s.PortMappings = p.Net.PublishPorts s.CNINetworks = p.Net.CNINetworks - if p.Net.DNSHost { + if p.Net.UseImageResolvConf { s.NoManageResolvConf = true } s.DNSServer = p.Net.DNSServers diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index 096af2df2..d742cc53d 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -32,17 +32,17 @@ type VolumeDeleteReport struct{ Report } // NetOptions reflect the shared network options between // pods and containers type NetOptions struct { - AddHosts []string - CNINetworks []string - DNSHost bool - DNSOptions []string - DNSSearch []string - DNSServers []net.IP - Network specgen.Namespace - NoHosts bool - PublishPorts []ocicni.PortMapping - StaticIP *net.IP - StaticMAC *net.HardwareAddr + AddHosts []string + CNINetworks []string + UseImageResolvConf bool + DNSOptions []string + DNSSearch []string + DNSServers []net.IP + Network specgen.Namespace + NoHosts bool + PublishPorts []ocicni.PortMapping + StaticIP *net.IP + StaticMAC *net.HardwareAddr } // All CLI inspect commands and inspect sub-commands use the same options |