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

reflector dns

Browse Source
This commit is contained in:
wencaiwulue
2021-08-07 11:32:15 +08:00
parent 53cf14a296
commit 1cd7d98a8f
8 changed files with 44 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dns/dns_unix.go
View File

@@ -1,22 +1,16 @@
// +build !windows
package dns
import (
"context"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"io/fs"
"io/ioutil"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"kubevpn/remote"
"kubevpn/util"
"os"
"path/filepath"
)
func Dns(ip string) error {
func DNS(ip string) error {
var err error
if err = os.MkdirAll(filepath.Join("/", "etc", "resolver"), fs.ModePerm); err != nil {
log.Error(err)
@@ -25,27 +19,3 @@ func Dns(ip string) error {
fileContent := "nameserver " + ip
return ioutil.WriteFile(filename, []byte(fileContent), fs.ModePerm)
}
func GetDNSIp(clientset *kubernetes.Clientset) (string, error) {
serviceList, err := clientset.CoreV1().Services(v1.NamespaceSystem).List(context.Background(), v1.ListOptions{
FieldSelector: fields.OneTermEqualSelector("metadata.name", "kube-dns").String(),
})
if err != nil {
return "", err
}
if len(serviceList.Items) == 0 {
return "", errors.New("Not found kube-dns")
}
return serviceList.Items[0].Spec.ClusterIP, nil
}
func GetDNSServiceIpFromPod(clientset *kubernetes.Clientset, restclient *rest.RESTClient, config *rest.Config, podName, namespace string) string {
if ip, err := GetDNSIp(clientset); err == nil && len(ip) != 0 {
return ip
}
if ip, err := util.Shell(clientset, restclient, config, remote.TrafficManager, namespace, "cat /etc/resolv.conf | grep nameserver | awk '{print$2}'"); err == nil && len(ip) != 0 {
return ip
}
log.Fatal("this should not happened")
return ""
}

4
dns/dns.go → dns/dns_windows.go
View File

@@ -1,3 +1,5 @@
// +build windows
package dns
import (
@@ -7,7 +9,7 @@ import (
"os/exec"
)
func Windows(ip string) error {
func DNS(ip string) error {
tunName := os.Getenv("tunName")
fmt.Println("tun name: " + tunName)
args := []string{

18
pkg/cfg.go
View File

@@ -4,7 +4,6 @@ import (
"bufio"
"crypto/tls"
"crypto/x509"
"encoding/json"
"errors"
gost2 "kubevpn/gost"
@@ -64,23 +63,6 @@ func loadCA(caFile string) (cp *x509.CertPool, err error) {
return
}
func parseKCPConfig(configFile string) (*gost2.KCPConfig, error) {
if configFile == "" {
return nil, nil
}
file, err := os.Open(configFile)
if err != nil {
return nil, err
}
defer file.Close()
config := &gost2.KCPConfig{}
if err = json.NewDecoder(file).Decode(config); err != nil {
return nil, err
}
return config, nil
}
func parseUsers(authFile string) (users []*url.Userinfo, err error) {
if authFile == "" {
return

12
pkg/main.go
View File

@@ -127,15 +127,9 @@ func main() {
log.Fatal(err)
}
//time.Sleep(time.Second * 5)
dnsServiceIp := dns.GetDNSServiceIpFromPod(clientset, restclient, config, remote.TrafficManager, namespace)
if runtime.GOOS != "windows" {
if err := dns.Dns(dnsServiceIp); err != nil {
log.Fatal(err)
}
} else {
if err := dns.Windows(dnsServiceIp); err != nil {
log.Fatal(err)
}
dnsServiceIp := util.GetDNSServiceIpFromPod(clientset, restclient, config, remote.TrafficManager, namespace)
if err := dns.DNS(dnsServiceIp); err != nil {
log.Fatal(err)
}
log.Info("dns service ok")
_ = exec.Command("ping", "-c", "4", "192.168.254.100").Run()

14
pkg/peer.go
View File

@@ -6,7 +6,7 @@ import (
"encoding/json"
"io"
"io/ioutil"
gost2 "kubevpn/gost"
"kubevpn/gost"
"strconv"
"strings"
"time"
@@ -18,8 +18,8 @@ type peerConfig struct {
FailTimeout time.Duration
period time.Duration // the period for live reloading
Nodes []string `json:"nodes"`
group *gost2.NodeGroup
baseNodes []gost2.Node
group *gost.NodeGroup
baseNodes []gost.Node
stopped chan struct{}
}
@@ -45,14 +45,14 @@ func (cfg *peerConfig) Reload(r io.Reader) error {
group := cfg.group
group.SetSelector(
nil,
gost2.WithFilter(
&gost2.FailFilter{
gost.WithFilter(
&gost.FailFilter{
MaxFails: cfg.MaxFails,
FailTimeout: cfg.FailTimeout,
},
&gost2.InvalidFilter{},
&gost.InvalidFilter{},
),
gost2.WithStrategy(gost2.NewStrategy(cfg.Strategy)),
gost.WithStrategy(gost.NewStrategy(cfg.Strategy)),
)
gNodes := cfg.baseNodes

2
remote/Dockerfile
View File

@@ -1,7 +1,7 @@
FROM ubuntu:latest
WORKDIR /app
RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
RUN apt-get clean && apt-get update && apt-get install -y wget dnsutils vim curl net-tools iptables
RUN apt-get clean && apt-get update && apt-get install -y wget dnsutils vim curl net-tools iptables iputils-ping
RUN curl -fL https://github.com/ginuerzh/gost/releases/download/v2.11.1/gost-linux-amd64-2.11.1.gz -o gost.gz
RUN gzip gost.gz -d && chmod +x gost && mv gost /usr/local/bin/gost

24
remote/dnspod.yaml
View File

@@ -1,24 +0,0 @@
apiVersion: v1
kind: Pod
metadata:
name: dnspod
labels:
app: dnspod
spec:
containers:
- name: dnspod
image: naison/gost:latest
imagePullPolicy: IfNotPresent
command:
- gost -D
resources:
requests:
memory: "256Mi"
cpu: "128m"
limits:
memory: "512Mi"
cpu: "256m"
ports:
- containerPort: 22
restartPolicy: Always
priorityClassName: system-cluster-critical

27
util/util.go
View File

@@ -5,11 +5,13 @@ import (
"context"
"fmt"
dockerterm "github.com/moby/term"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"io"
v12 "k8s.io/api/autoscaling/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -24,6 +26,7 @@ import (
"k8s.io/client-go/transport/spdy"
"k8s.io/client-go/util/retry"
"k8s.io/kubectl/pkg/cmd/exec"
"kubevpn/remote"
"net"
"net/http"
"os"
@@ -208,3 +211,27 @@ func Shell(clientset *kubernetes.Clientset, restclient *rest.RESTClient, config
err = tt.Safe(fn)
return strings.TrimRight(stdoutBuf.String(), "\n"), err
}
func GetDNSIp(clientset *kubernetes.Clientset) (string, error) {
serviceList, err := clientset.CoreV1().Services(metav1.NamespaceSystem).List(context.Background(), metav1.ListOptions{
FieldSelector: fields.OneTermEqualSelector("metadata.name", "kube-dns").String(),
})
if err != nil {
return "", err
}
if len(serviceList.Items) == 0 {
return "", errors.New("Not found kube-dns")
}
return serviceList.Items[0].Spec.ClusterIP, nil
}
func GetDNSServiceIpFromPod(clientset *kubernetes.Clientset, restclient *rest.RESTClient, config *rest.Config, podName, namespace string) string {
if ip, err := GetDNSIp(clientset); err == nil && len(ip) != 0 {
return ip
}
if ip, err := Shell(clientset, restclient, config, remote.TrafficManager, namespace, "cat /etc/resolv.conf | grep nameserver | awk '{print$2}'"); err == nil && len(ip) != 0 {
return ip
}
log.Fatal("this should not happened")
return ""
}