Skip to content
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

Jump to bottom

Allow macOS to resolve service FQDNs during 'minikube tunnel' #3464

Merged
merged 3 commits into from
May 17, 2019
Merged

Allow macOS to resolve service FQDNs during 'minikube tunnel' #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd15020
Add ability to resolve service FQDNs from host during 'minikube tunne…
ceason Dec 16, 2018
335da39
Test for DNS resolution on Mac
ceason Jan 2, 2019
082fe50
Merge remote-tracking branch 'origin/master' into tunnel-dns
ceason Jan 2, 2019
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
12 changes: 9 additions & 3 deletions pkg/minikube/tunnel/cluster_inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/pkg/errors"
"k8s.io/minikube/pkg/minikube/cluster"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/util"
)

type clusterInspector struct {
Expand Down Expand Up @@ -93,9 +94,14 @@ func getRoute(host *host.Host, clusterConfig config.Config) (*Route, error) {
if ip == nil {
return nil, fmt.Errorf("invalid IP for host %s", hostDriverIP)
}

dnsIp, err := util.GetDNSIP(ipNet.String())
if err != nil {
return nil, err
}
return &Route{
Gateway: ip,
DestCIDR: ipNet,
Gateway: ip,
DestCIDR: ipNet,
ClusterDomain: clusterConfig.KubernetesConfig.DNSDomain,
ClusterDNSIP: dnsIp,
}, nil
}
7 changes: 5 additions & 2 deletions pkg/minikube/tunnel/cluster_inspector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package tunnel

import (
"k8s.io/minikube/pkg/util"
"testing"

"net"
Expand Down Expand Up @@ -78,10 +79,12 @@ func TestMinikubeCheckReturnsHostInformation(t *testing.T) {

ip := net.ParseIP("1.2.3.4")
_, ipNet, _ := net.ParseCIDR("96.0.0.0/12")
dnsIp, _ := util.GetDNSIP(ipNet.String())

expectedRoute := &Route{
Gateway: ip,
DestCIDR: ipNet,
Gateway: ip,
DestCIDR: ipNet,
ClusterDNSIP: dnsIp,
}

if s != Running {
Expand Down
37 changes: 37 additions & 0 deletions pkg/minikube/tunnel/route_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ package tunnel

import (
"fmt"
"io/ioutil"
"net"
"os"
"os/exec"
"regexp"
"strings"
Expand All @@ -34,6 +36,9 @@ func (router *osRouter) EnsureRouteIsAdded(route *Route) error {
if exists {
return nil
}
if err := writeResolverFile(route); err != nil {
return fmt.Errorf("could not write /etc/resolver/{cluster_domain} file: %s", err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't include the path name in the message, as EnsureRouteIsAdded doesn't authoritatively know what it is. My suggestion is: return fmt.Errorf("write resolver file: %v", err)

}

serviceCIDR := route.DestCIDR.String()
gatewayIP := route.Gateway.String()
Expand Down Expand Up @@ -162,5 +167,37 @@ func (router *osRouter) Cleanup(route *Route) error {
if !re.MatchString(message) {
return fmt.Errorf("error deleting route: %s, %d", message, len(strings.Split(message, "\n")))
}
// idempotent removal of cluster domain dns
resolverFile := fmt.Sprintf("/etc/resolver/%s", route.ClusterDomain)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make '/etc/resolver' a constant to share between functions, and use filepath.Join to create paths from it.

Also, I prefer that the variable name uses path instead of file, since the latter references something specific in Go (file.File)

command = exec.Command("sudo", "rm", "-f", resolverFile)
if err := command.Run(); err != nil {
return fmt.Errorf("could not remove %s: %s", resolverFile, err)
}
return nil
}

func writeResolverFile(route *Route) error {
resolverFile := "/etc/resolver/" + route.ClusterDomain
content := fmt.Sprintf("nameserver %s\nsearch_order 1\n", route.ClusterDNSIP)
// write resolver content into tmpFile, then copy it to /etc/resolver/clusterDomain
tmpFile, err := ioutil.TempFile("", "minikube-tunnel-resolver-")
if err != nil {
return err
}
defer os.Remove(tmpFile.Name())
if _, err = tmpFile.WriteString(content); err != nil {
return err
}
if err = tmpFile.Close(); err != nil {
return err
}
command := exec.Command("sudo", "mkdir", "-p", "/etc/resolver")
if err := command.Run(); err != nil {
return err
}
command = exec.Command("sudo", "cp", "-f", tmpFile.Name(), resolverFile)
if err := command.Run(); err != nil {
return err
}
return nil
}
35 changes: 28 additions & 7 deletions pkg/minikube/tunnel/route_darwin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ func TestDarwinRouteFailsOnConflictIntegrationTest(t *testing.T) {
IP: net.IPv4(10, 96, 0, 0),
Mask: net.IPv4Mask(255, 240, 0, 0),
},
ClusterDomain: "cluster.local",
ClusterDNSIP: net.IPv4(10, 96, 0, 10),
}
conflictingCfg := *cfg
conflictingCfg.Gateway = net.IPv4(127, 0, 0, 2)

addRoute(t, "10.96.0.0/12", "127.0.0.2")
addRoute(t, &conflictingCfg)
defer cleanRoute(t, &conflictingCfg)
err := (&osRouter{}).EnsureRouteIsAdded(cfg)
if err == nil {
t.Errorf("add should have error, but it is nil")
Expand All @@ -51,9 +56,11 @@ func TestDarwinRouteIdempotentIntegrationTest(t *testing.T) {
IP: net.IPv4(10, 96, 0, 0),
Mask: net.IPv4Mask(255, 240, 0, 0),
},
ClusterDomain: "cluster.local",
ClusterDNSIP: net.IPv4(10, 96, 0, 10),
}

cleanRoute(t, "10.96.0.0/12")
cleanRoute(t, cfg)
err := (&osRouter{}).EnsureRouteIsAdded(cfg)
if err != nil {
t.Errorf("add error: %s", err)
Expand All @@ -64,7 +71,7 @@ func TestDarwinRouteIdempotentIntegrationTest(t *testing.T) {
t.Errorf("add error: %s", err)
}

cleanRoute(t, "10.96.0.0/12")
cleanRoute(t, cfg)
}

func TestDarwinRouteCleanupIdempontentIntegrationTest(t *testing.T) {
Expand All @@ -75,10 +82,12 @@ func TestDarwinRouteCleanupIdempontentIntegrationTest(t *testing.T) {
IP: net.IPv4(10, 96, 0, 0),
Mask: net.IPv4Mask(255, 240, 0, 0),
},
ClusterDomain: "cluster.local",
ClusterDNSIP: net.IPv4(10, 96, 0, 10),
}

cleanRoute(t, "10.96.0.0/12")
addRoute(t, "10.96.0.0/12", "192.168.1.1")
cleanRoute(t, cfg)
addRoute(t, cfg)
err := (&osRouter{}).Cleanup(cfg)
if err != nil {
t.Errorf("cleanup failed with %s", err)
Expand All @@ -89,20 +98,32 @@ func TestDarwinRouteCleanupIdempontentIntegrationTest(t *testing.T) {
}
}

func addRoute(t *testing.T, cidr string, gw string) {
func addRoute(t *testing.T, r *Route) {
cidr := r.DestCIDR.String()
gw := r.Gateway.String()
command := exec.Command("sudo", "route", "-n", "add", cidr, gw)
_, err := command.CombinedOutput()
if err != nil {
t.Logf("add route error (should be ok): %s", err)
}
err = writeResolverFile(r)
if err != nil {
t.Logf("add route DNS resolver error (should be ok): %s", err)
}
}

func cleanRoute(t *testing.T, cidr string) {
func cleanRoute(t *testing.T, r *Route) {
cidr := r.DestCIDR.String()
command := exec.Command("sudo", "route", "-n", "delete", cidr)
_, err := command.CombinedOutput()
if err != nil {
t.Logf("cleanup error (should be ok): %s", err)
}
command = exec.Command("sudo", "rm", "-f", fmt.Sprintf("/etc/resolver/%s", r.ClusterDomain))
_, err = command.CombinedOutput()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're not using the output:

if err := command.Run(); err != nil {
  return fmt.Errorf("rm: %v", err)
}

if err != nil {
t.Logf("cleanup DNS resolver error (should be ok): %s", err)
}
}

func TestCIDRPadding(t *testing.T) {
Expand Down
7 changes: 5 additions & 2 deletions pkg/minikube/tunnel/route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package tunnel

import (
"k8s.io/minikube/pkg/util"
"net"
"reflect"
"testing"
Expand Down Expand Up @@ -130,10 +131,12 @@ got
func unsafeParseRoute(gatewayIP string, destCIDR string) *Route {
ip := net.ParseIP(gatewayIP)
_, ipNet, _ := net.ParseCIDR(destCIDR)
dnsIp, _ := util.GetDNSIP(ipNet.String())

expectedRoute := &Route{
Gateway: ip,
DestCIDR: ipNet,
Gateway: ip,
DestCIDR: ipNet,
ClusterDNSIP: dnsIp,
}
return expectedRoute
}
6 changes: 4 additions & 2 deletions pkg/minikube/tunnel/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ func (t *Status) String() string {
}

type Route struct {
Gateway net.IP
DestCIDR *net.IPNet
Gateway net.IP
DestCIDR *net.IPNet
ClusterDomain string
ClusterDNSIP net.IP
}

func (r *Route) String() string {
Expand Down