diff --git a/test/e2e/framework/service/const.go b/test/e2e/framework/service/const.go index a4ed7f81bec..edecc7bfbe4 100644 --- a/test/e2e/framework/service/const.go +++ b/test/e2e/framework/service/const.go @@ -50,16 +50,20 @@ const ( // LoadBalancerCreateTimeoutDefault is the default time to wait for a load balancer to be created/modified. // TODO: once support ticket 21807001 is resolved, reduce this timeout back to something reasonable - LoadBalancerCreateTimeoutDefault = 20 * time.Minute + // Hideen - use GetServiceLoadBalancerCreateTimeout function instead. + loadBalancerCreateTimeoutDefault = 20 * time.Minute // LoadBalancerCreateTimeoutLarge is the maximum time to wait for a load balancer to be created/modified. - LoadBalancerCreateTimeoutLarge = 2 * time.Hour + // Hideen - use GetServiceLoadBalancerCreateTimeout function instead. + loadBalancerCreateTimeoutLarge = 2 * time.Hour // LoadBalancerPropagationTimeoutDefault is the default time to wait for pods to // be targeted by load balancers. - LoadBalancerPropagationTimeoutDefault = 10 * time.Minute + // Hideen - use GetServiceLoadBalancerPropagationTimeout function instead. + loadBalancerPropagationTimeoutDefault = 10 * time.Minute // LoadBalancerPropagationTimeoutLarge is the maximum time to wait for pods to // be targeted by load balancers. - LoadBalancerPropagationTimeoutLarge = time.Hour + // Hideen - use GetServiceLoadBalancerPropagationTimeout function instead. + loadBalancerPropagationTimeoutLarge = time.Hour // LoadBalancerCleanupTimeout is the time required by the loadbalancer to cleanup, proportional to numApps/Ing. // Bring the cleanup timeout back down to 5m once b/33588344 is resolved. diff --git a/test/e2e/framework/service/resource.go b/test/e2e/framework/service/resource.go index aea0d20e308..29bae0ee2d5 100644 --- a/test/e2e/framework/service/resource.go +++ b/test/e2e/framework/service/resource.go @@ -104,9 +104,9 @@ func GetServiceLoadBalancerCreationTimeout(cs clientset.Interface) time.Duration nodes, err := e2enode.GetReadySchedulableNodes(cs) framework.ExpectNoError(err) if len(nodes.Items) > LargeClusterMinNodesNumber { - return LoadBalancerCreateTimeoutLarge + return loadBalancerCreateTimeoutLarge } - return LoadBalancerCreateTimeoutDefault + return loadBalancerCreateTimeoutDefault } // GetServiceLoadBalancerPropagationTimeout returns a timeout value for propagating a load balancer of a service. @@ -114,9 +114,9 @@ func GetServiceLoadBalancerPropagationTimeout(cs clientset.Interface) time.Durat nodes, err := e2enode.GetReadySchedulableNodes(cs) framework.ExpectNoError(err) if len(nodes.Items) > LargeClusterMinNodesNumber { - return LoadBalancerPropagationTimeoutLarge + return loadBalancerPropagationTimeoutLarge } - return LoadBalancerPropagationTimeoutDefault + return loadBalancerPropagationTimeoutDefault } // CreateServiceForSimpleAppWithPods is a convenience wrapper to create a service and its matching pods all at once.