dns forwarding

panumjp · Jan 22, 2022 · 885f47e · 885f47e
1 parent 41c9f66
commit 885f47e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/plugins/meta/dnsname/config.go b/plugins/meta/dnsname/config.go
@@ -22,6 +22,9 @@ const dnsMasqTemplate = `## WARNING: THIS IS AN AUTOGENERATED FILE
 ## LIKELY TO AUTOMATICALLY BE REPLACED.
 strict-order
 local=/{{.Domain}}/
+{{- range $domain, $server := .Servers}}
+server=/{{ $domain }}/{{ $server }}
+{{- end }}
 domain={{.Domain}}
 expand-hosts
 pid-file={{.PidFile}}
@@ -45,6 +48,7 @@ type DNSNameConf struct {
 	RuntimeConfig struct { // The capability arg
 		Aliases map[string][]string `json:"aliases"`
 	} `json:"runtimeConfig,omitempty"`
+	Servers map[string]string `json:"servers,omitempty"`
 }
 
 // dnsNameFile describes the plugin's attributes
@@ -55,6 +59,7 @@ type dnsNameFile struct {
 	Domain           string
 	NetworkInterface string
 	PidFile          string
+	Servers          map[string]string
 }
 
 // dnsNameConfPath tells where we store the conf, pid, and hosts files

diff --git a/plugins/meta/dnsname/dnsname_test.go b/plugins/meta/dnsname/dnsname_test.go
@@ -126,7 +126,7 @@ var _ = Describe("dnsname tests", func() {
 			}
 			Expect(reflect.DeepEqual(expectedFileNames, resultingFileNames)).To(BeTrue())
 
-			d, err := newDNSMasqFile("foobar.io", "dummy0", "test")
+			d, err := newDNSMasqFile("foobar.io", "dummy0", "test", map[string]string{})
 			Expect(err).To(BeNil())
 
 			// Check that the dns masq instance is running
@@ -166,7 +166,7 @@ var _ = Describe("dnsname tests", func() {
 			_, err = current.GetResult(r)
 			Expect(err).NotTo(HaveOccurred())
 
-			d, err := newDNSMasqFile("foobar.io", "dummy0", "test")
+			d, err := newDNSMasqFile("foobar.io", "dummy0", "test", map[string]string{})
 			Expect(err).To(BeNil())
 
 			pid, err := d.getProcess()

diff --git a/plugins/meta/dnsname/main.go b/plugins/meta/dnsname/main.go
@@ -56,7 +56,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 	if err != nil {
 		return err
 	}
-	dnsNameConf, err := newDNSMasqFile(netConf.DomainName, result.Interfaces[0].Name, netConf.Name)
+	dnsNameConf, err := newDNSMasqFile(netConf.DomainName, result.Interfaces[0].Name, netConf.Name, netConf.Servers)
 	if err != nil {
 		return err
 	}
@@ -118,7 +118,7 @@ func cmdDel(args *skel.CmdArgs) error {
 	} else if result == nil {
 		return nil
 	}
-	dnsNameConf, err := newDNSMasqFile(netConf.DomainName, result.Interfaces[0].Name, netConf.Name)
+	dnsNameConf, err := newDNSMasqFile(netConf.DomainName, result.Interfaces[0].Name, netConf.Name, netConf.Servers)
 	if err != nil {
 		logrus.Error(err)
 		return nil
@@ -187,7 +187,7 @@ func cmdCheck(args *skel.CmdArgs) error {
 	if result == nil {
 		return errors.Errorf("Required prevResult missing")
 	}
-	dnsNameConf, err := newDNSMasqFile(netConf.DomainName, result.Interfaces[0].Name, netConf.Name)
+	dnsNameConf, err := newDNSMasqFile(netConf.DomainName, result.Interfaces[0].Name, netConf.Name, netConf.Servers)
 	if err != nil {
 		return err
 	}

diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go
@@ -15,7 +15,7 @@ import (
 )
 
 // newDNSMasqFile creates a new instance of a dnsNameFile
-func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) {
+func newDNSMasqFile(domainName, networkInterface, networkName string, servers map[string]string) (dnsNameFile, error) {
 	dnsMasqBinary, err := exec.LookPath("dnsmasq")
 	if err != nil {
 		return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH")
@@ -27,6 +27,7 @@ func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFi
 		NetworkInterface: networkInterface,
 		AddOnHostsFile:   makePath(networkName, hostsFileName),
 		Binary:           dnsMasqBinary,
+		Servers:          servers,
 	}
 	return masqConf, nil
 }