Merge pull request #13000 from sivchari/migrate-extensionconfig-requeue-to-requeueafter

🌱  Migrate from Requeue to RequeueAfter in extensionconfig

Author: k8s-ci-robot

.golangci.yml

@@ -279,7 +279,7 @@ linters:
           - staticcheck
         text: 'SA1019: .*(res|result|i|j)\.Requeue is deprecated: Use `RequeueAfter` instead'
         # TODO: Remove Requeue step by step
-        path: internal/controllers/(extensionconfig|machinepool)|util/util.go
+        path: internal/controllers/machinepool
       # TODO: var-naming: avoid meaningless package names by revive
       #   * test/infrastructure/docker/internal/docker/types/
       #   * bootstrap/kubeadm/types/

internal/controllers/extensionconfig/extensionconfig_controller.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
@@ -132,7 +133,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	// Requeue events when the registry is not ready.
 	// The registry will become ready after it is 'warmed up' by warmupRunnable.
 	if !r.RuntimeClient.IsReady() {
-		return ctrl.Result{Requeue: true}, nil
+		return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
 	}
 
 	extensionConfig := &runtimev1.ExtensionConfig{}

internal/controllers/extensionconfig/extensionconfig_controller_test.go

@@ -102,7 +102,7 @@ func TestExtensionReconciler_Reconcile(t *testing.T) {
 		res, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: util.ObjectKey(extensionConfig)})
 		g.Expect(err).ToNot(HaveOccurred())
 		// If the registry isn't warm the reconcile loop will return Requeue: True
-		g.Expect(res.Requeue).To(BeTrue())
+		g.Expect(res.RequeueAfter).To((Equal(10 * time.Second)))
 	})
 
 	t.Run("successful reconcile and discovery on ExtensionConfig create", func(*testing.T) {

util/util.go

@@ -690,6 +690,8 @@ func IsSupportedVersionSkew(a, b semver.Version) bool {
 
 // LowestNonZeroResult compares two reconciliation results
 // and returns the one with lowest requeue time.
+//
+//nolint:staticcheck // SA1019: Requeue is deprecated.
 func LowestNonZeroResult(i, j ctrl.Result) ctrl.Result {
 	switch {
 	case i.IsZero():