Add read/write timeout options for Typha connection.

projectcalico · Aug 29, 2017 · e06edc0 · e06edc0
1 parent 2993e8c
commit e06edc0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/config/config_params.go b/config/config_params.go
@@ -102,9 +102,11 @@ type Config struct {
 	EtcdCaFile    string   `config:"file(must-exist);;local"`
 	EtcdEndpoints []string `config:"endpoint-list;;local"`
 
-	TyphaAddr           string `config:"authority;;"`
-	TyphaK8sServiceName string `config:"string;"`
-	TyphaK8sNamespace   string `config:"string;kube-system;non-zero"`
+	TyphaAddr           string        `config:"authority;;"`
+	TyphaK8sServiceName string        `config:"string;"`
+	TyphaK8sNamespace   string        `config:"string;kube-system;non-zero"`
+	TyphaReadTimeout    time.Duration `config:"seconds;30"`
+	TyphaWriteTimeout   time.Duration `config:"seconds;10"`
 
 	Ipv6Support    bool `config:"bool;true"`
 	IgnoreLooseRPF bool `config:"bool;false"`

diff --git a/felix.go b/felix.go
@@ -346,6 +346,10 @@ configRetry:
 			fmt.Sprintf("Revision: %s; Build date: %s",
 				buildinfo.GitRevision, buildinfo.BuildDate),
 			syncerToValidator,
+			&syncclient.Options{
+				ReadTimeout:  configParams.TyphaReadTimeout,
+				WriteTimeout: configParams.TyphaWriteTimeout,
+			},
 		)
 	} else {
 		// Use the syncer locally.

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -44,7 +44,8 @@ import:
 - package: k8s.io/client-go
   version: 4a3ab2f5be5177366f8206fd79ce55ca80e417fa
 - package: github.com/projectcalico/typha
-  version: ec14f2716227ed72aff32691071f4b450367930a
+  repo: https://github.com/fasaxc/typha.git
+  version: add-client-timeout
   subpackages:
   - pkg/syncclient
 - package: github.com/emicklei/go-restful