Merge pull request #4406 from CecileRobertMichon/timeout-reconcile-co…

…nfig

Make all reconcile timeouts configurable

azure/interfaces.go

@@ -18,6 +18,7 @@ package azure
 
 import (
 	"context"
+	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
@@ -101,6 +102,14 @@ type AsyncStatusUpdater interface {
 	UpdatePutStatus(clusterv1.ConditionType, string, error)
 	UpdateDeleteStatus(clusterv1.ConditionType, string, error)
 	UpdatePatchStatus(clusterv1.ConditionType, string, error)
+	AsyncReconciler
+}
+
+// AsyncReconciler is an interface used to get the default timeouts and requeue time for a reconciler that reconciles services asynchronously.
+type AsyncReconciler interface {
+	DefaultedAzureCallTimeout() time.Duration
+	DefaultedAzureServiceReconcileTimeout() time.Duration
+	DefaultedReconcilerRequeue() time.Duration
 }
 
 // ClusterScoper combines the ClusterDescriber and NetworkDescriber interfaces.
@@ -116,6 +125,7 @@ type ClusterScoper interface {
 type ManagedClusterScoper interface {
 	ClusterDescriber
 	NodeResourceGroup() string
+	AsyncReconciler
 }
 
 // ResourceSpecGetter is an interface for getting all the required information to create/update/delete an Azure resource.

azure/scope/cluster.go

@@ -61,6 +61,7 @@ type ClusterScopeParams struct {
 	Cluster      *clusterv1.Cluster
 	AzureCluster *infrav1.AzureCluster
 	Cache        *ClusterCache
+	Timeouts     azure.AsyncReconciler
 }
 
 // NewClusterScope creates a new Scope from the supplied parameters.
@@ -95,12 +96,13 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 	}
 
 	return &ClusterScope{
-		Client:       params.Client,
-		AzureClients: params.AzureClients,
-		Cluster:      params.Cluster,
-		AzureCluster: params.AzureCluster,
-		patchHelper:  helper,
-		cache:        params.Cache,
+		Client:          params.Client,
+		AzureClients:    params.AzureClients,
+		Cluster:         params.Cluster,
+		AzureCluster:    params.AzureCluster,
+		patchHelper:     helper,
+		cache:           params.Cache,
+		AsyncReconciler: params.Timeouts,
 	}, nil
 }
 
@@ -113,6 +115,7 @@ type ClusterScope struct {
 	AzureClients
 	Cluster      *clusterv1.Cluster
 	AzureCluster *infrav1.AzureCluster
+	azure.AsyncReconciler
 }
 
 // ClusterCache stores ClusterCache data locally so we don't have to hit the API multiple times within the same reconcile loop.

azure/scope/managedcontrolplane.go

@@ -69,6 +69,7 @@ type ManagedControlPlaneScopeParams struct {
 	ControlPlane        *infrav1.AzureManagedControlPlane
 	ManagedMachinePools []ManagedMachinePool
 	Cache               *ManagedControlPlaneCache
+	Timeouts            azure.AsyncReconciler
 }
 
 // NewManagedControlPlaneScope creates a new Scope from the supplied parameters.
@@ -111,6 +112,7 @@ func NewManagedControlPlaneScope(ctx context.Context, params ManagedControlPlane
 		ManagedMachinePools: params.ManagedMachinePools,
 		PatchHelper:         helper,
 		cache:               params.Cache,
+		AsyncReconciler:     params.Timeouts,
 	}, nil
 }
 
@@ -126,6 +128,7 @@ type ManagedControlPlaneScope struct {
 	Cluster             *clusterv1.Cluster
 	ControlPlane        *infrav1.AzureManagedControlPlane
 	ManagedMachinePools []ManagedMachinePool
+	azure.AsyncReconciler
 }
 
 // ManagedControlPlaneCache stores ManagedControlPlane data locally so we don't have to hit the API multiple times within the same reconcile loop.