Merge pull request #3661 from k8s-infra-cherrypick-robot/cherry-pick-3657-to-release-1.8

[release-1.8] Increase AKS reconcile timeout

Author: k8s-ci-robot

azure/services/managedclusters/managedclusters.go

@@ -71,7 +71,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	ctx, _, done := tele.StartSpanWithLogger(ctx, "managedclusters.Service.Reconcile")
 	defer done()
 
-	ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAzureServiceReconcileTimeout)
+	ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAKSServiceReconcileTimeout)
 	defer cancel()
 
 	managedClusterSpec := s.Scope.ManagedClusterSpec()

util/reconciler/defaults.go

@@ -27,6 +27,8 @@ const (
 	DefaultMappingTimeout = 60 * time.Second
 	// DefaultAzureServiceReconcileTimeout is the default timeout for an Azure service reconcile.
 	DefaultAzureServiceReconcileTimeout = 12 * time.Second
+	// DefaultAKSServiceReconcileTimeout is the default timeout for an AKS service reconcile.
+	DefaultAKSServiceReconcileTimeout = 30 * time.Second
 	// DefaultAzureCallTimeout is the default timeout for an Azure request after which an Azure operation is considered long running.
 	DefaultAzureCallTimeout = 2 * time.Second
 	// DefaultReconcilerRequeue is the default value for the reconcile retry.