ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #99 from kinvolk/alban/dns-config

Browse Source 
*: add "dns" field to the configuration
This commit is contained in:
Stefan Junker 2016-01-27 08:49:16 +01:00
commit 1da421150c
6 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/ptp.md
View File

@ -14,7 +14,11 @@ The traffic of the container interface will be routed through the interface of t
"ipam": {
"type": "host-local",
"subnet": "10.1.1.0/24"
}
},
"dns": [
"8.8.8.8",
"8.8.4.4"
]
}
## Network configuration reference
@ -24,3 +28,4 @@ The traffic of the container interface will be routed through the interface of t
* `ipMasq` (boolean, optional): set up IP Masquerade on the host for traffic originating from this network and destined outside of it. Defaults to false.
* `mtu` (integer, optional): explicitly set MTU to the specified value. Defaults to value chosen by the kernel.
* `ipam` (dictionary, required): IPAM configuration to be used for this network.
* `dns` (string array, optional): name servers to return as is in the [Result](/SPEC.md#result). Defaults to empty list.

1
pkg/types/types.go
View File

@ -67,6 +67,7 @@ type NetConf struct {
type Result struct {
IP4 *IPConfig `json:"ip4,omitempty"`
IP6 *IPConfig `json:"ip6,omitempty"`
DNS []string `json:"dns,omitempty"`
}
func (r *Result) Print() error {

10
plugins/main/bridge/bridge.go
View File

@ -35,10 +35,11 @@ const defaultBrName = "cni0"
type NetConf struct {
types.NetConf
BrName string `json:"bridge"`
IsGW bool `json:"isGateway"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"`
BrName string `json:"bridge"`
IsGW bool `json:"isGateway"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"`
DNS []string `json:"dns"`
}
func init() {
@ -226,6 +227,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
}
result.DNS = n.DNS
return result.Print()
}

8
plugins/main/ipvlan/ipvlan.go
View File

@ -31,9 +31,10 @@ import (
type NetConf struct {
types.NetConf
Master string `json:"master"`
Mode string `json:"mode"`
MTU int `json:"mtu"`
Master string `json:"master"`
Mode string `json:"mode"`
MTU int `json:"mtu"`
DNS []string `json:"dns"`
}
func init() {
@ -138,6 +139,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return err
}
result.DNS = n.DNS
return result.Print()
}

8
plugins/main/macvlan/macvlan.go
View File

@ -31,9 +31,10 @@ import (
type NetConf struct {
types.NetConf
Master string `json:"master"`
Mode string `json:"mode"`
MTU int `json:"mtu"`
Master string `json:"master"`
Mode string `json:"mode"`
MTU int `json:"mtu"`
DNS []string `json:"dns"`
}
func init() {
@ -142,6 +143,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return err
}
result.DNS = n.DNS
return result.Print()
}

6
plugins/main/ptp/ptp.go
View File

@ -41,8 +41,9 @@ func init() {
type NetConf struct {
types.NetConf
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"`
DNS []string `json:"dns"`
}
func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string, error) {
@ -185,6 +186,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
}
result.DNS = conf.DNS
return result.Print()
}