github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29612 from ping035627/ping035627-patch-0726-1

Browse Source 
Automatic merge from submit-queue

Combine the const definition

The PR combine the const definition in service.go, and it seems more concise, I think.
This commit is contained in:
k8s-merge-robot
2016-07-29 15:54:08 -07:00
committed by GitHub
parent 486a31bb11 1606ce57ea
commit fb09be4561
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/service.go
View File

@@ -43,22 +43,24 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
// Maximum time a kube-proxy daemon on a node is allowed to not const (
// notice a Service update, such as type=NodePort. // Maximum time a kube-proxy daemon on a node is allowed to not
// TODO: This timeout should be O(10s), observed values are O(1m), 5m is very // notice a Service update, such as type=NodePort.
// liberal. Fix tracked in #20567. // TODO: This timeout should be O(10s), observed values are O(1m), 5m is very
const kubeProxyLagTimeout = 5 * time.Minute // liberal. Fix tracked in #20567.
kubeProxyLagTimeout = 5 * time.Minute
// Maximum time a load balancer is allowed to not respond after creation. // Maximum time a load balancer is allowed to not respond after creation.
const loadBalancerLagTimeoutDefault = 2 * time.Minute loadBalancerLagTimeoutDefault = 2 * time.Minute
// On AWS there is a delay between ELB creation and serving traffic; // On AWS there is a delay between ELB creation and serving traffic;
// a few minutes is typical, so use 10m. // a few minutes is typical, so use 10m.
const loadBalancerLagTimeoutAWS = 10 * time.Minute loadBalancerLagTimeoutAWS = 10 * time.Minute
// How long to wait for a load balancer to be created/modified. // How long to wait for a load balancer to be created/modified.
//TODO: once support ticket 21807001 is resolved, reduce this timeout back to something reasonable //TODO: once support ticket 21807001 is resolved, reduce this timeout back to something reasonable
const loadBalancerCreateTimeout = 20 * time.Minute loadBalancerCreateTimeout = 20 * time.Minute
)
// This should match whatever the default/configured range is // This should match whatever the default/configured range is
var ServiceNodePortRange = utilnet.PortRange{Base: 30000, Size: 2768} var ServiceNodePortRange = utilnet.PortRange{Base: 30000, Size: 2768}