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

optimize

Browse Source
This commit is contained in:
p_caiwfeng
2021-11-17 20:08:18 +08:00
parent af33818ac0
commit ca26f873ed
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dns/dns.go
View File

@@ -18,23 +18,22 @@ func GetDNSServiceIPFromPod(clientset *kubernetes.Clientset, restclient *rest.RE
if ips, err := getDNSIPFromDnsPod(clientset); err == nil && len(ips) != 0 {
ipp = ips
}
if ip, err := util.Shell(clientset, restclient, config, podName, namespace, "cat /etc/resolv.conf"); err == nil {
if resolvConf, err := miekgdns.ClientConfigFromReader(bytes.NewBufferString(ip)); err == nil {
if len(ipp) != 0 {
resolvConf.Servers = append(resolvConf.Servers, make([]string, len(ipp))...)
copy(resolvConf.Servers[len(ipp):], resolvConf.Servers[:len(resolvConf.Servers)-len(ipp)])
for i := range ipp {
resolvConf.Servers[i] = ipp[i]
}
}
return resolvConf, nil
} else {
return nil, err
}
} else {
ip, err := util.Shell(clientset, restclient, config, podName, namespace, "cat /etc/resolv.conf")
if err != nil {
return nil, err
}
return nil, errors.New("this should not happened")
resolvConf, err := miekgdns.ClientConfigFromReader(bytes.NewBufferString(ip))
if err != nil {
return nil, err
}
if len(ipp) != 0 {
resolvConf.Servers = append(resolvConf.Servers, make([]string, len(ipp))...)
copy(resolvConf.Servers[len(ipp):], resolvConf.Servers[:len(resolvConf.Servers)-len(ipp)])
for i := range ipp {
resolvConf.Servers[i] = ipp[i]
}
}
return resolvConf, nil
}
func getDNSIPFromDnsPod(clientset *kubernetes.Clientset) (ips []string, err error) {