diff --git a/pkg/core/tunhandlerclient.go b/pkg/core/tunhandlerclient.go index f4fd40b5..85c52ac1 100644 --- a/pkg/core/tunhandlerclient.go +++ b/pkg/core/tunhandlerclient.go @@ -7,6 +7,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" plog "github.com/wencaiwulue/kubevpn/v2/pkg/log" "github.com/wencaiwulue/kubevpn/v2/pkg/util" diff --git a/pkg/handler/connect.go b/pkg/handler/connect.go index 5279b6b7..67931769 100644 --- a/pkg/handler/connect.go +++ b/pkg/handler/connect.go @@ -296,8 +296,8 @@ func (c *ConnectOptions) portForward(ctx context.Context, portPair []string) err sortBy := func(pods []*v1.Pod) sort.Interface { return sort.Reverse(podutils.ActivePods(pods)) } label := fields.OneTermEqualSelector("app", config.ConfigMapPodTrafficManager).String() - _, _, _ = polymorphichelpers.GetFirstPod(c.clientset.CoreV1(), c.Namespace, label, time.Second*10, sortBy) - ctx2, cancelFunc2 := context.WithTimeout(ctx, time.Second*10) + _, _, _ = polymorphichelpers.GetFirstPod(c.clientset.CoreV1(), c.Namespace, label, time.Second*5, sortBy) + ctx2, cancelFunc2 := context.WithTimeout(ctx, time.Second*5) defer cancelFunc2() podList, err := c.GetRunningPodList(ctx2) if err != nil { diff --git a/pkg/util/pod.go b/pkg/util/pod.go index 6ba43396..1a9e890d 100644 --- a/pkg/util/pod.go +++ b/pkg/util/pod.go @@ -335,7 +335,7 @@ func CheckPodStatus(ctx context.Context, cancelFunc context.CancelFunc, podName return err != nil }, func() error { - ctx1, cancelFunc1 := context.WithTimeout(ctx, time.Second*10) + ctx1, cancelFunc1 := context.WithTimeout(ctx, time.Second*5) defer cancelFunc1() _, err := podInterface.Get(ctx1, podName, v1.GetOptions{}) return err