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 code

Browse Source
This commit is contained in:
p_caiwfeng
2021-12-12 16:41:10 +08:00
parent 03c36e47cf
commit aff9505ab8
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/remote.go
View File

@@ -20,7 +20,7 @@ import (
"time"
)
func CreateOutboundRouterPod(clientset *kubernetes.Clientset, namespace string, trafficManagerIP *net.IPNet, nodeCIDR []*net.IPNet) (string, error) {
func CreateOutboundRouterPod(clientset *kubernetes.Clientset, namespace string, trafficManagerIP *net.IPNet, nodeCIDR []*net.IPNet) (net.IP, error) {
firstPod, i, err3 := polymorphichelpers.GetFirstPod(clientset.CoreV1(),
namespace,
fields.OneTermEqualSelector("app", util.TrafficManager).String(),
@@ -32,7 +32,7 @@ func CreateOutboundRouterPod(clientset *kubernetes.Clientset, namespace string,
if err3 == nil && i != 0 && firstPod != nil {
UpdateRefCount(clientset, namespace, firstPod.Name, 1)
return firstPod.Status.PodIP, nil
return net.ParseIP(firstPod.Status.PodIP), nil
}
args := []string{
"sysctl net.ipv4.ip_forward=1",
@@ -104,12 +104,12 @@ func CreateOutboundRouterPod(clientset *kubernetes.Clientset, namespace string,
case e := <-watch.ResultChan():
if e.Object.(*v1.Pod).Status.Phase == v1.PodRunning {
watch.Stop()
return e.Object.(*v1.Pod).Status.PodIP, nil
return net.ParseIP(e.Object.(*v1.Pod).Status.PodIP), nil
}
case <-tick:
watch.Stop()
log.Error("timeout")
return "", errors.New("timeout")
return nil, errors.New("timeout")
}
}
}