merge from master

2018-11-02 13:13:24 +08:00 · 2018-11-02 13:13:24 +08:00 · ce6e564f82
commit ce6e564f82
parent 6d2d42ee0b 7982beb5f2
86 changed files with 1448 additions and 3530 deletions
--- a/internal/ingress/controller/controller.go
+++ b/internal/ingress/controller/controller.go
@ -61,6 +61,7 @@ type Configuration struct {
 	ForceNamespaceIsolation bool

 	DefaultHealthzURL     string
+	HealthCheckTimeout    time.Duration
 	DefaultSSLCertificate string

 	// +optional