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/specgen/specgen.go | |
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/specgen/specgen.go')
-rw-r--r-- | pkg/specgen/specgen.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 1a05733f9..0b568dd5c 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -319,24 +319,24 @@ type ContainerNetworkConfig struct { // by Podman, but instead sourced from the image. // Conflicts with DNSServer, DNSSearch, DNSOption. UseImageResolvConf bool `json:"use_image_resolve_conf,omitempty"` - // DNSServer is a set of DNS servers that will be used in the + // DNSServers is a set of DNS servers that will be used in the // container's resolv.conf, replacing the host's DNS Servers which are // used by default. // Conflicts with UseImageResolvConf. // Optional. - DNSServer []net.IP `json:"dns_server,omitempty"` + DNSServers []net.IP `json:"dns_server,omitempty"` // DNSSearch is a set of DNS search domains that will be used in the // container's resolv.conf, replacing the host's DNS search domains // which are used by default. // Conflicts with UseImageResolvConf. // Optional. DNSSearch []string `json:"dns_search,omitempty"` - // DNSOption is a set of DNS options that will be used in the + // DNSOptions is a set of DNS options that will be used in the // container's resolv.conf, replacing the host's DNS options which are // used by default. // Conflicts with UseImageResolvConf. // Optional. - DNSOption []string `json:"dns_option,omitempty"` + DNSOptions []string `json:"dns_option,omitempty"` // UseImageHosts indicates that /etc/hosts should not be managed by // Podman, and instead sourced from the image. // Conflicts with HostAdd. |