mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-28 21:55:48 +00:00
e2e: Add tests for network tiers in GCE
This commit is contained in:
@@ -483,6 +483,31 @@ func (j *ServiceTestJig) UpdateServiceOrFail(namespace, name string, update func
|
||||
return svc
|
||||
}
|
||||
|
||||
func (j *ServiceTestJig) WaitForNewIngressIPOrFail(namespace, name, existingIP string, timeout time.Duration) *v1.Service {
|
||||
var service *v1.Service
|
||||
Logf("Waiting up to %v for service %q to get a new ingress IP", timeout, name)
|
||||
pollFunc := func() (bool, error) {
|
||||
svc, err := j.Client.Core().Services(namespace).Get(name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if len(svc.Status.LoadBalancer.Ingress) == 0 {
|
||||
return false, nil
|
||||
}
|
||||
ip := svc.Status.LoadBalancer.Ingress[0].IP
|
||||
if ip == "" || ip == existingIP {
|
||||
return false, nil
|
||||
}
|
||||
// Got a new IP.
|
||||
service = svc
|
||||
return true, nil
|
||||
}
|
||||
if err := wait.PollImmediate(Poll, timeout, pollFunc); err != nil {
|
||||
Failf("Timeout waiting for service %q to have a new ingress IP", name)
|
||||
}
|
||||
return service
|
||||
}
|
||||
|
||||
func (j *ServiceTestJig) ChangeServiceNodePortOrFail(namespace, name string, initial int) *v1.Service {
|
||||
var err error
|
||||
var service *v1.Service
|
||||
@@ -1421,3 +1446,10 @@ func EnableAndDisableInternalLB() (enable func(svc *v1.Service), disable func(sv
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func GetServiceLoadBalancerCreationTimeout(cs clientset.Interface) time.Duration {
|
||||
if nodes := GetReadySchedulableNodesOrDie(cs); len(nodes.Items) > LargeClusterMinNodesNumber {
|
||||
return LoadBalancerCreateTimeoutLarge
|
||||
}
|
||||
return LoadBalancerCreateTimeoutDefault
|
||||
}
|
||||
|
Reference in New Issue
Block a user