rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-04 16:21:07 +00:00
Code Issues Releases Wiki Activity

Build docker-sys bridge via system-docker args and remove cni-glue

Browse Source
This commit is contained in:
niusmallnan
2018-04-16 14:16:08 +08:00
parent da8d5ed027
commit ba388b6bc6
10 changed files with 31 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
netconf/netconf_linux.go
View File

@@ -66,7 +66,7 @@ func createInterfaces(netCfg *NetworkConfig) {
}
func createSlaveInterfaces(netCfg *NetworkConfig) {
links, err := netlink.LinkList()
links, err := GetValidLinkList()
if err != nil {
log.Errorf("Failed to list links: %v", err)
return
@@ -167,7 +167,7 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig, userSetHostname, userSetDNS bool
createInterfaces(netCfg)
createSlaveInterfaces(netCfg)
links, err := netlink.LinkList()
links, err := GetValidLinkList()
if err != nil {
log.Errorf("error getting LinkList: %s", err)
return false, err
@@ -177,10 +177,7 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig, userSetHostname, userSetDNS bool
//apply network config
for _, link := range links {
linkName := link.Attrs().Name
if linkName != "lo" {
applyOuter(link, netCfg, &wg, userSetHostname, userSetDNS)
}
applyOuter(link, netCfg, &wg, userSetHostname, userSetDNS)
}
wg.Wait()
@@ -189,13 +186,11 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig, userSetHostname, userSetDNS bool
dnsSet := false
for _, link := range links {
linkName := link.Attrs().Name
if linkName != "lo" {
log.Infof("dns testing %s", linkName)
lease := GetDhcpLease(linkName)
if _, ok := lease["domain_name_servers"]; ok {
log.Infof("dns was dhcp set for %s", linkName)
dnsSet = true
}
log.Infof("dns testing %s", linkName)
lease := GetDhcpLease(linkName)
if _, ok := lease["domain_name_servers"]; ok {
log.Infof("dns was dhcp set for %s", linkName)
dnsSet = true
}
}
@@ -510,3 +505,22 @@ func runCmds(cmds []string, iface string) {
}
}
}
func GetValidLinkList() ([]netlink.Link, error) {
var validLinkList []netlink.Link
links, err := netlink.LinkList()
if err != nil {
return validLinkList, err
}
for _, l := range links {
linkName := l.Attrs().Name
if linkName == "lo" || linkName == "docker-sys" {
continue
}
validLinkList = append(validLinkList, l)
}
return validLinkList, nil
}