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

gather 223.254.254.100/24 as config

Browse Source
This commit is contained in:
p_caiwfeng
2022-01-09 17:26:13 +08:00
parent 96c14a8a49
commit 53f5bbb3b4
7 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/connect.go
View File

@@ -44,8 +44,8 @@ type ConnectOptions struct {
}
var trafficManager = net.IPNet{
IP: net.IPv4(223, 254, 254, 100),
Mask: net.CIDRMask(24, 32),
IP: util.RouterIP,
Mask: util.CIDR.Mask,
}
func (c *ConnectOptions) createRemoteInboundPod() (err error) {

11
pkg/dhcp.go
View File

@@ -68,7 +68,10 @@ func (d *DHCPManager) RentIPBaseNICAddress() (*net.IPNet, error) {
if err != nil {
return nil, err
}
return &net.IPNet{IP: net.IPv4(223, 254, 254, byte(<-ipC)), Mask: net.CIDRMask(24, 32)}, nil
p := make(net.IP, net.IPv4len)
copy(p, util.RouterIP.To4())
p[3] = byte(<-ipC)
return &net.IPNet{IP: p, Mask: util.CIDR.Mask}, nil
}
func (d *DHCPManager) RentIPRandom() (*net.IPNet, error) {
@@ -89,8 +92,10 @@ func (d *DHCPManager) RentIPRandom() (*net.IPNet, error) {
log.Errorf("update dhcp error after get ip, need to put ip back, err: %v", err)
return nil, err
}
return &net.IPNet{IP: net.IPv4(223, 254, 254, byte(<-ipC)), Mask: net.CIDRMask(24, 32)}, nil
p := make(net.IP, net.IPv4len)
copy(p, util.RouterIP.To4())
p[3] = byte(<-ipC)
return &net.IPNet{IP: p, Mask: util.CIDR.Mask}, nil
}
func getIP(alreadyInUse sets.Int) int {

8
pkg/mesh/controller.go
View File

@@ -75,10 +75,10 @@ func AddMeshContainer(spec *v1.PodTemplateSpec, configMapName string, c util.Pod
"iptables -F;" +
"iptables -P INPUT ACCEPT;" +
"iptables -P FORWARD ACCEPT;" +
"iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 80:60000 ! -s 127.0.0.1 ! -d 223.254.254.1/24 -j DNAT --to 127.0.0.1:15006;" +
"iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 80:60000 ! -s 127.0.0.1 ! -d 223.254.254.1/24 -j MASQUERADE;" +
"iptables -t nat -A PREROUTING -i eth0 -p udp --dport 80:60000 ! -s 127.0.0.1 ! -d 223.254.254.1/24 -j DNAT --to 127.0.0.1:15006;" +
"iptables -t nat -A POSTROUTING -p udp -m udp --dport 80:60000 ! -s 127.0.0.1 ! -d 223.254.254.1/24 -j MASQUERADE;" +
"iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 80:60000 ! -s 127.0.0.1 ! -d " + util.CIDR.String() + " -j DNAT --to 127.0.0.1:15006;" +
"iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 80:60000 ! -s 127.0.0.1 ! -d " + util.CIDR.String() + " -j MASQUERADE;" +
"iptables -t nat -A PREROUTING -i eth0 -p udp --dport 80:60000 ! -s 127.0.0.1 ! -d " + util.CIDR.String() + " -j DNAT --to 127.0.0.1:15006;" +
"iptables -t nat -A POSTROUTING -p udp -m udp --dport 80:60000 ! -s 127.0.0.1 ! -d " + util.CIDR.String() + " -j MASQUERADE;" +
"envoy -c /etc/envoy/base-envoy.yaml",
},
SecurityContext: &v1.SecurityContext{

2
pkg/remote.go
View File

@@ -43,7 +43,7 @@ func CreateOutboundRouterPod(clientset *kubernetes.Clientset, namespace string,
"iptables -F",
"iptables -P INPUT ACCEPT",
"iptables -P FORWARD ACCEPT",
"iptables -t nat -A POSTROUTING -s 223.254.254.0/24 -o eth0 -j MASQUERADE",
"iptables -t nat -A POSTROUTING -s " + util.CIDR.String() + " -o eth0 -j MASQUERADE",
}
for _, ipNet := range nodeCIDR {
args = append(args, "iptables -t nat -A POSTROUTING -s "+ipNet.String()+" -o eth0 -j MASQUERADE")

11
util/config.go
View File

@@ -9,6 +9,17 @@ import (
const TrafficManager = "kubevpn.traffic.manager"
var CIDR *net.IPNet
var RouterIP net.IP
const (
s = "223.254.254.100/24"
)
func init() {
RouterIP, CIDR, _ = net.ParseCIDR(s)
}
// Debug is a flag that enables the debug log.
var Debug bool

2
util/networkpolicy.go
View File

@@ -33,7 +33,7 @@ func AddFirewallRule() {
"dir=in",
"action=allow",
"enable=yes",
"remoteip=223.254.254.1/24,LocalSubnet",
"remoteip=" + CIDR.String() + ",LocalSubnet",
}...)
if out, err := cmd.CombinedOutput(); err != nil {
log.Infof("error while exec command: %s, out: %s, err: %v", cmd.Args, string(out), err)

2
util/util.go
View File

@@ -426,7 +426,7 @@ func Heartbeats(ctx context.Context) {
c2 <- struct{}{}
case <-c2:
for i := 0; i < 4; i++ {
_, _ = Ping("223.254.254.100")
_, _ = Ping(RouterIP.String())
}
case <-ctx.Done():
return