test: calc create service timeout from annotations

Author: lukasmetzner

tests/e2e/cloud_test.go

@@ -73,7 +73,7 @@ func TestServiceLoadBalancersMinimalSetup(t *testing.T) {
 		string(annotation.LBLocation): "nbg1",
 	})
 
-	lbSvc, err = lbTest.CreateService(lbSvc, 6*time.Minute)
+	lbSvc, err = lbTest.CreateService(lbSvc)
 	require.NoError(t, err)
 
 	err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, false)
@@ -102,7 +102,7 @@ func TestServiceLoadBalancersHTTPS(t *testing.T) {
 		string(annotation.LBSvcProtocol):         "https",
 	})
 
-	lbSvc, err = lbTest.CreateService(lbSvc, 6*time.Minute)
+	lbSvc, err = lbTest.CreateService(lbSvc)
 	require.NoError(t, err)
 
 	err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, true)
@@ -135,7 +135,7 @@ func TestServiceLoadBalancersHTTPSWithManagedCertificate(t *testing.T) {
 		string(annotation.LBSvcHTTPManagedCertificateUseACMEStaging): "true",
 	})
 
-	lbSvc, err = lbTest.CreateService(lbSvc, 16*time.Minute)
+	lbSvc, err = lbTest.CreateService(lbSvc)
 	require.NoError(t, err)
 
 	certs, err := testCluster.hcloud.Certificate.AllWithOpts(t.Context(), hcloud.CertificateListOpts{
@@ -171,7 +171,7 @@ func TestServiceLoadBalancersWithPrivateNetwork(t *testing.T) {
 		string(annotation.PrivateSubnetIPRange): ipRange.String(),
 	})
 
-	lbSvc, err = lbTest.CreateService(lbSvc, 8*time.Minute)
+	lbSvc, err = lbTest.CreateService(lbSvc)
 	require.NoError(t, err)
 
 	err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, false)

tests/e2e/helper_test.go

@@ -24,12 +24,37 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
+	"github.com/hetznercloud/hcloud-cloud-controller-manager/internal/annotation"
 	"github.com/hetznercloud/hcloud-cloud-controller-manager/internal/hcops"
 	"github.com/hetznercloud/hcloud-cloud-controller-manager/internal/testsupport"
 	"github.com/hetznercloud/hcloud-cloud-controller-manager/internal/utils"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
 
+// Load Balancer creation timeouts. Services that involve certificate
+// provisioning take longer to become ready.
+const (
+	lbCreateTimeoutDefault = 8 * time.Minute
+	lbCreateTimeoutCert    = 16 * time.Minute
+)
+
+// lbCreateTimeoutFor returns the timeout to use when waiting for the given
+// Load Balancer service to become ready.
+func lbCreateTimeoutFor(svc *corev1.Service) time.Duration {
+	certAnnotations := []annotation.Name{
+		annotation.LBSvcHTTPCertificates,
+		annotation.LBSvcHTTPCertificateType,
+		annotation.LBSvcHTTPManagedCertificateName,
+		annotation.LBSvcHTTPManagedCertificateDomains,
+	}
+	for _, a := range certAnnotations {
+		if _, ok := svc.Annotations[string(a)]; ok {
+			return lbCreateTimeoutCert
+		}
+	}
+	return lbCreateTimeoutDefault
+}
+
 var rng *rand.Rand
 
 func init() {
@@ -291,10 +316,13 @@ func (l *lbTestHelper) ServiceDefinition(pod *corev1.Pod, annotations map[string
 }
 
 // CreateService creates a k8s service based on the given service definition
-// and waits until it is "ready".
-func (l *lbTestHelper) CreateService(lbSvc *corev1.Service, timeout time.Duration) (*corev1.Service, error) {
+// and waits until it is "ready". The wait timeout is derived from the service
+// annotations: services that provision certificates get a longer timeout.
+func (l *lbTestHelper) CreateService(lbSvc *corev1.Service) (*corev1.Service, error) {
 	l.t.Helper()
 
+	timeout := lbCreateTimeoutFor(lbSvc)
+
 	lbSvc, err := testCluster.k8sClient.CoreV1().Services(l.namespace).Create(l.t.Context(), lbSvc, metav1.CreateOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("could not create service: %w", err)

tests/e2e/robot_test.go

@@ -4,7 +4,6 @@ package e2e
 
 import (
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -88,7 +87,7 @@ func TestServiceLoadBalancersRobot(t *testing.T) {
 		string(annotation.LBNodeSelector): "instance.hetzner.cloud/is-root-server=true",
 	})
 
-	lbSvc, err = lbTest.CreateService(lbSvc, 8*time.Minute)
+	lbSvc, err = lbTest.CreateService(lbSvc)
 	require.NoError(t, err)
 
 	err = lbTest.WaitForHTTPAvailable(lbSvc.Status.LoadBalancer.Ingress[0].IP, false)