apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

back to using /etc/resolver, found networksetup not working on macOS 10.15.7

Browse Source
This commit is contained in:
p_caiwfeng
2021-10-08 13:54:12 +08:00
parent e173b93c58
commit 7efd5cfebe
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dns/dns_unix.go
View File

@@ -9,9 +9,12 @@ import (
"github.com/fsnotify/fsnotify"
miekgdns "github.com/miekg/dns"
log "github.com/sirupsen/logrus"
"io/fs"
"io/ioutil"
"k8s.io/apimachinery/pkg/util/sets"
"os"
"os/exec"
"path/filepath"
"strings"
"time"
)
@@ -19,19 +22,35 @@ import (
var cancel context.CancelFunc
var resolv = "/etc/resolv.conf"
// sw_vers to using different strategy on different
func SetupDNS(ip string, namespace string) error {
/*var err error
usingResolver(ip, namespace)
_ = exec.Command("killall", "mDNSResponderHelper").Run()
_ = exec.Command("killall", "-HUP", "mDNSResponder").Run()
_ = exec.Command("dscacheutil", "-flushcache").Run()
return nil
}
func usingResolver(ip string, namespace string) {
var err error
_ = os.RemoveAll(filepath.Join("/", "etc", "resolver"))
if err = os.MkdirAll(filepath.Join("/", "etc", "resolver"), fs.ModePerm); err != nil {
log.Error(err)
}
builder := strings.Builder{}
builder.WriteString(fmt.Sprintf("nameserver %s\n", ip))
builder.WriteString(fmt.Sprintf("search %s\n", strings.Join([]string{namespace + ".svc.cluster.local", "svc.cluster.local", "cluster.local"}, " ")))
builder.WriteString(fmt.Sprintf("options ndots:5\n"))
builder.WriteString(fmt.Sprintf("options timeout:1\n"))
filename := filepath.Join("/", "etc", "resolver", "local")
fileContent := "nameserver " + ip
_ = ioutil.WriteFile(filename, []byte(fileContent), fs.ModePerm)
_ = ioutil.WriteFile(filename, []byte(builder.String()), 0644)
filename = filepath.Join("/", "etc", "resolver", namespace)
fileContent = "nameserver " + ip + "\nsearch " + namespace + ".svc.cluster.local svc.cluster.local cluster.local\noptions ndots:5"
_ = ioutil.WriteFile(filename, []byte(fileContent), fs.ModePerm)*/
_ = ioutil.WriteFile(filename, []byte(builder.String()), 0644)
}
func usingNetworkSetup(ip string, namespace string) {
networkSetup(ip, namespace)
var ctx context.Context
ctx, cancel = context.WithCancel(context.TODO())
@@ -69,7 +88,6 @@ func SetupDNS(ip string, namespace string) error {
}
}
}()
return nil
}
func toString(config miekgdns.ClientConfig) string {
@@ -103,8 +121,11 @@ func toString(config miekgdns.ClientConfig) string {
}
func CancelDNS() {
cancel()
networkCancel()
if cancel != nil {
cancel()
}
_ = os.RemoveAll(filepath.Join("/", "etc", "resolver"))
//networkCancel()
}
/*