Skip to content

Remove HNSNetwork's DNS suffix in Windows #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2018
Merged

Remove HNSNetwork's DNS suffix in Windows #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e5d3d
remove network dns suffix and preserve endpoint dns suffix
saiyan86 Oct 6, 2018
0970ab9
rename
Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package network
import (
"fmt"
"net"
"strings"

"github.com/Azure/azure-container-networking/cni"
"github.com/Azure/azure-container-networking/cns"
Expand Down Expand Up @@ -327,6 +326,14 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
return err
}

nwDNSInfo, err := getNetworkDNSSettings(nwCfg, result, k8sNamespace)
if err != nil {
err = plugin.Errorf("Failed to getDNSSettings: %v", err)
return err
}

log.Printf("[cni-net] nwDNSInfo: %v", nwDNSInfo)

// Create the network.
nwInfo := network.NetworkInfo{
Id: networkId,
Expand All @@ -340,11 +347,8 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
},
BridgeName: nwCfg.Bridge,
EnableSnatOnHost: nwCfg.EnableSnatOnHost,
DNS: network.DNSInfo{
Servers: nwCfg.DNS.Nameservers,
Suffix: k8sNamespace + "." + strings.Join(nwCfg.DNS.Search, ","),
},
Policies: policies,
DNS: nwDNSInfo,
Policies: policies,
}

nwInfo.Options = make(map[string]interface{})
Expand Down Expand Up @@ -386,24 +390,23 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
}
}

epDNSInfo, err := getEndpointDNSSettings(nwCfg, result, k8sNamespace)
if err != nil {
err = plugin.Errorf("Failed to getEndpointDNSSettings: %v", err)
return err
}

epInfo = &network.EndpointInfo{
Id: endpointId,
ContainerID: args.ContainerID,
NetNsPath: args.Netns,
IfName: args.IfName,
EnableSnatOnHost: nwCfg.EnableSnatOnHost,
EnableInfraVnet: enableInfraVnet,
Data: make(map[string]interface{}),
DNS: epDNSInfo,
Policies: policies,
}
epInfo.Data = make(map[string]interface{})

dns, err := getDNSSettings(nwCfg, result, k8sNamespace)
if err != nil {
log.Printf("Error retrieving dns settings %v", err)
return err
}

epInfo.DNS = dns
epInfo.Policies = policies

// Populate addresses.
for _, ipconfig := range result.IPs {
Expand Down
14 changes: 9 additions & 5 deletions cni/network/network_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,24 @@ func setupInfraVnetRoutingForMultitenancy(
}
}

func getDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
var dns network.DNSInfo
func getNetworkDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
var nwDNS network.DNSInfo

if len(nwCfg.DNS.Nameservers) > 0 {
dns = network.DNSInfo{
nwDNS = network.DNSInfo{
Servers: nwCfg.DNS.Nameservers,
Suffix: nwCfg.DNS.Domain,
}
} else {
dns = network.DNSInfo{
nwDNS = network.DNSInfo{
Suffix: result.DNS.Domain,
Servers: result.DNS.Nameservers,
}
}

return dns, nil
return nwDNS, nil
}

func getEndpointDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
return getNetworkDNSSettings(nwCfg, result, namespace)
}
27 changes: 21 additions & 6 deletions cni/network/network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,40 @@ func setupInfraVnetRoutingForMultitenancy(
result *cniTypesCurr.Result) {
}

func getDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
var dns network.DNSInfo
func getNetworkDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
var nwDNS network.DNSInfo

if (len(nwCfg.DNS.Search) == 0) != (len(nwCfg.DNS.Nameservers) == 0) {
err := fmt.Errorf("Wrong DNS configuration: %+v", nwCfg.DNS)
return dns, err
return nwDNS, err
}

nwDNS = network.DNSInfo{
Servers: nwCfg.DNS.Nameservers,
}

return nwDNS, nil
}

func getEndpointDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
var epDNS network.DNSInfo

if (len(nwCfg.DNS.Search) == 0) != (len(nwCfg.DNS.Nameservers) == 0) {
err := fmt.Errorf("Wrong DNS configuration: %+v", nwCfg.DNS)
return epDNS, err
}

if len(nwCfg.DNS.Search) > 0 {
dns = network.DNSInfo{
epDNS = network.DNSInfo{
Servers: nwCfg.DNS.Nameservers,
Suffix: namespace + "." + strings.Join(nwCfg.DNS.Search, ","),
}
} else {
dns = network.DNSInfo{
epDNS = network.DNSInfo{
Suffix: result.DNS.Domain,
Servers: result.DNS.Nameservers,
}
}

return dns, nil
return epDNS, nil
}
1 change: 0 additions & 1 deletion network/network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func (nm *networkManager) newNetworkImpl(nwInfo *NetworkInfo, extIf *externalInt
hnsNetwork := &hcsshim.HNSNetwork{
Name: nwInfo.Id,
NetworkAdapterName: networkAdapterName,
DNSSuffix: nwInfo.DNS.Suffix,
DNSServerList: strings.Join(nwInfo.DNS.Servers, ","),
Policies: policy.SerializePolicies(policy.NetworkPolicy, nwInfo.Policies),
}
Expand Down