Merge pull request kubernetes#19976 from aarondav/elb-timeout

Auto commit by PR queue bot
mattf · Jan 31, 2016 · 3db1a6c · 3db1a6c
2 parents f684e80 + 97689c3
commit 3db1a6c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go
@@ -195,10 +195,10 @@ func (s *AWSCloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerD
 	actual := loadBalancer.HealthCheck
 
 	// Default AWS settings
-	expectedHealthyThreshold := int64(10)
-	expectedUnhealthyThreshold := int64(2)
+	expectedHealthyThreshold := int64(2)
+	expectedUnhealthyThreshold := int64(6)
 	expectedTimeout := int64(5)
-	expectedInterval := int64(30)
+	expectedInterval := int64(10)
 
 	// We only a TCP health-check on the first port
 	expectedTarget := ""