github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19976 from aarondav/elb-timeout

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-30 18:57:56 -08:00
commit 3db1a6c3ce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View File

@ -195,10 +195,10 @@ func (s *AWSCloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerD
actual := loadBalancer.HealthCheck actual := loadBalancer.HealthCheck
// Default AWS settings // Default AWS settings
expectedHealthyThreshold := int64(10) expectedHealthyThreshold := int64(2)
expectedUnhealthyThreshold := int64(2) expectedUnhealthyThreshold := int64(6)
expectedTimeout := int64(5) expectedTimeout := int64(5)
expectedInterval := int64(30) expectedInterval := int64(10)
// We only a TCP health-check on the first port // We only a TCP health-check on the first port
expectedTarget := "" expectedTarget := ""