Skip to content

Commit 2e933db

Browse files
committed
test: lb creation timeouts depending on test case
1 parent 741a511 commit 2e933db

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

tests/e2e/cloud_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestServiceLoadBalancersMinimalSetup(t *testing.T) {
7373
string(annotation.LBLocation): "nbg1",
7474
})
7575

76-
lbSvc, err = lbTest.CreateService(lbSvc)
76+
lbSvc, err = lbTest.CreateService(lbSvc, 6*time.Minute)
7777
require.NoError(t, err)
7878

7979
err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, false)
@@ -102,7 +102,7 @@ func TestServiceLoadBalancersHTTPS(t *testing.T) {
102102
string(annotation.LBSvcProtocol): "https",
103103
})
104104

105-
lbSvc, err = lbTest.CreateService(lbSvc)
105+
lbSvc, err = lbTest.CreateService(lbSvc, 6*time.Minute)
106106
require.NoError(t, err)
107107

108108
err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, true)
@@ -135,7 +135,7 @@ func TestServiceLoadBalancersHTTPSWithManagedCertificate(t *testing.T) {
135135
string(annotation.LBSvcHTTPManagedCertificateUseACMEStaging): "true",
136136
})
137137

138-
lbSvc, err = lbTest.CreateService(lbSvc)
138+
lbSvc, err = lbTest.CreateService(lbSvc, 16*time.Minute)
139139
require.NoError(t, err)
140140

141141
certs, err := testCluster.hcloud.Certificate.AllWithOpts(t.Context(), hcloud.CertificateListOpts{
@@ -171,7 +171,7 @@ func TestServiceLoadBalancersWithPrivateNetwork(t *testing.T) {
171171
string(annotation.PrivateSubnetIPRange): ipRange.String(),
172172
})
173173

174-
lbSvc, err = lbTest.CreateService(lbSvc)
174+
lbSvc, err = lbTest.CreateService(lbSvc, 8*time.Minute)
175175
require.NoError(t, err)
176176

177177
err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, false)

tests/e2e/helper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ func (l *lbTestHelper) ServiceDefinition(pod *corev1.Pod, annotations map[string
292292

293293
// CreateService creates a k8s service based on the given service definition
294294
// and waits until it is "ready".
295-
func (l *lbTestHelper) CreateService(lbSvc *corev1.Service) (*corev1.Service, error) {
295+
func (l *lbTestHelper) CreateService(lbSvc *corev1.Service, timeout time.Duration) (*corev1.Service, error) {
296296
l.t.Helper()
297297

298298
lbSvc, err := testCluster.k8sClient.CoreV1().Services(l.namespace).Create(l.t.Context(), lbSvc, metav1.CreateOptions{})
@@ -302,7 +302,7 @@ func (l *lbTestHelper) CreateService(lbSvc *corev1.Service) (*corev1.Service, er
302302

303303
testCluster.loadBalancers.Add(string(lbSvc.UID))
304304

305-
ctx, cancel := context.WithTimeout(l.t.Context(), 8*time.Minute)
305+
ctx, cancel := context.WithTimeout(l.t.Context(), timeout)
306306
defer cancel()
307307

308308
retries := 0

0 commit comments

Comments
 (0)