fix: watch will break if timeout is set

kubeovn · Oct 18, 2019 · f970615 · f970615
1 parent 8d6588b
commit f970615
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -2,11 +2,10 @@ package controller
 
 import (
 	"flag"
-	"github.com/alauda/kube-ovn/pkg/util"
 	"os"
-	"time"
 
 	clientset "github.com/alauda/kube-ovn/pkg/client/clientset/versioned"
+	"github.com/alauda/kube-ovn/pkg/util"
 	"github.com/spf13/pflag"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -156,7 +155,6 @@ func (config *Configuration) initKubeClient() error {
 			return err
 		}
 	}
-	cfg.Timeout = 15 * time.Second
 	kubeClient, err := kubernetes.NewForConfig(cfg)
 	if err != nil {
 		klog.Errorf("init kubernetes client failed %v", err)

diff --git a/pkg/daemon/config.go b/pkg/daemon/config.go
@@ -9,14 +9,12 @@ import (
 	"os/exec"
 	"strings"
 	"syscall"
-	"time"
 
+	clientset "github.com/alauda/kube-ovn/pkg/client/clientset/versioned"
 	"github.com/alauda/kube-ovn/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/vishvananda/netlink"
-
-	clientset "github.com/alauda/kube-ovn/pkg/client/clientset/versioned"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -146,7 +144,6 @@ func (config *Configuration) initKubeClient() error {
 			return err
 		}
 	}
-	cfg.Timeout = 15 * time.Second
 
 	kubeClient, err := kubernetes.NewForConfig(cfg)
 	if err != nil {