Skip to content

Commit fbf5ae2

Browse files
authored
Merge pull request #3660 from k8s-infra-cherrypick-robot/cherry-pick-3657-to-release-1.9
[release-1.9] Increase AKS reconcile timeout
2 parents f42caa3 + 9952c7a commit fbf5ae2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

azure/services/managedclusters/managedclusters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
7171
ctx, _, done := tele.StartSpanWithLogger(ctx, "managedclusters.Service.Reconcile")
7272
defer done()
7373

74-
ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAzureServiceReconcileTimeout)
74+
ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAKSServiceReconcileTimeout)
7575
defer cancel()
7676

7777
managedClusterSpec := s.Scope.ManagedClusterSpec()

util/reconciler/defaults.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ const (
2727
DefaultMappingTimeout = 60 * time.Second
2828
// DefaultAzureServiceReconcileTimeout is the default timeout for an Azure service reconcile.
2929
DefaultAzureServiceReconcileTimeout = 12 * time.Second
30+
// DefaultAKSServiceReconcileTimeout is the default timeout for an AKS service reconcile.
31+
DefaultAKSServiceReconcileTimeout = 30 * time.Second
3032
// DefaultAzureCallTimeout is the default timeout for an Azure request after which an Azure operation is considered long running.
3133
DefaultAzureCallTimeout = 2 * time.Second
3234
// DefaultReconcilerRequeue is the default value for the reconcile retry.

0 commit comments

Comments
 (0)