bump k8s 1.34: fix Requeue removal

Author: damdo

pkg/controller/machinehealthcheck/machinehealthcheck_controller.go

@@ -43,6 +43,7 @@ const (
 	remediationStrategyAnnotation = "machine.openshift.io/remediation-strategy"
 	remediationStrategyExternal   = machinev1.RemediationStrategyType("external-baremetal")
 	defaultNodeStartupTimeout     = 10 * time.Minute
+	defaultRequeueAfter           = 1 * time.Millisecond
 	machineNodeNameIndex          = "machineNodeNameIndex"
 	controllerName                = "machinehealthcheck-controller"
 
@@ -246,7 +247,7 @@ func (r *ReconcileMachineHealthCheck) Reconcile(ctx context.Context, request rec
 			mhc.Spec.MaxUnhealthy,
 		)
 		metrics.ObserveMachineHealthCheckShortCircuitEnabled(mhc.Name, mhc.Namespace)
-		return reconcile.Result{Requeue: true}, nil
+		return reconcile.Result{RequeueAfter: defaultRequeueAfter}, nil
 	}
 	klog.V(3).Infof("Remediations are allowed for %s: total targets: %v,  max unhealthy: %v, unhealthy targets: %v",
 		request.String(),

pkg/controller/machinehealthcheck/machinehealthcheck_controller_test.go

@@ -307,7 +307,7 @@ func TestReconcile(t *testing.T) {
 			node:    nodeHealthy,
 			mhc:     machineHealthCheck,
 			expected: expectedReconcile{
-				result: reconcile.Result{Requeue: true},
+				result: reconcile.Result{},
 				error:  false,
 			},
 			expectedEvents: []string{},
@@ -327,7 +327,6 @@ func TestReconcile(t *testing.T) {
 			mhc:     machineHealthCheck,
 			expected: expectedReconcile{
 				result: reconcile.Result{
-					Requeue:      true,
 					RequeueAfter: 300 * time.Second,
 				},
 				error: false,
@@ -465,7 +464,7 @@ func TestReconcile(t *testing.T) {
 			mhc:     machineHealthCheckNegativeMaxUnhealthy,
 			expected: expectedReconcile{
 				result: reconcile.Result{
-					Requeue: true,
+					RequeueAfter: defaultRequeueAfter,
 				},
 				error: false,
 			},
@@ -3119,7 +3118,7 @@ func assertBaseReconcile(t *testing.T, tc testCase, ctx context.Context, r *Reco
 	}
 
 	if result != tc.expected.result {
-		if tc.expected.result.Requeue {
+		if tc.expected.result.RequeueAfter > 0 {
 			before := tc.expected.result.RequeueAfter
 			after := tc.expected.result.RequeueAfter + time.Second
 			if after < result.RequeueAfter || before > result.RequeueAfter {

pkg/operator/operator.go

@@ -393,8 +393,6 @@ func (optr *Operator) handleSyncResult(result reconcile.Result, err error, key s
 		// to result.RequestAfter
 		optr.queue.Forget(key)
 		optr.queue.AddAfter(key, result.RequeueAfter)
-	case result.Requeue:
-		optr.queue.AddRateLimited(key)
 	default:
 		// Finally, if no error occurs we Forget this item so it does not
 		// get queued again until another change happens.

pkg/operator/sync.go

@@ -121,7 +121,7 @@ func (optr *Operator) syncAll(config *OperatorConfig) (reconcile.Result, error)
 		klog.Errorf("Error waiting for resource to sync: %v", err)
 		return reconcile.Result{}, err
 	}
-	if result.Requeue || result.RequeueAfter > 0 {
+	if result.RequeueAfter > 0 {
 		// The deployment is not yet rolled out, do not set the status to available yet
 		return result, nil
 	}
@@ -170,7 +170,7 @@ func (optr *Operator) checkRolloutStatus(config *OperatorConfig) (reconcile.Resu
 	if err != nil {
 		return reconcile.Result{}, err
 	}
-	if result.Requeue || result.RequeueAfter > 0 {
+	if result.RequeueAfter > 0 {
 		return result, nil
 	}
 
@@ -180,7 +180,7 @@ func (optr *Operator) checkRolloutStatus(config *OperatorConfig) (reconcile.Resu
 		if err != nil {
 			return reconcile.Result{}, err
 		}
-		if result.Requeue || result.RequeueAfter > 0 {
+		if result.RequeueAfter > 0 {
 			return result, nil
 		}
 	}

pkg/operator/sync_test.go

@@ -22,7 +22,6 @@ func TestCheckDeploymentRolloutStatus(t *testing.T) {
 		name                 string
 		deployment           *appsv1.Deployment
 		expectedError        error
-		expectedRequeue      bool
 		expectedRequeueAfter time.Duration
 	}{
 		{
@@ -52,7 +51,6 @@ func TestCheckDeploymentRolloutStatus(t *testing.T) {
 				},
 			},
 			expectedError:        nil,
-			expectedRequeue:      false,
 			expectedRequeueAfter: 0,
 		},
 		{
@@ -82,7 +80,6 @@ func TestCheckDeploymentRolloutStatus(t *testing.T) {
 				},
 			},
 			expectedError:        nil,
-			expectedRequeue:      true,
 			expectedRequeueAfter: 170 * time.Second,
 		},
 		{
@@ -112,7 +109,6 @@ func TestCheckDeploymentRolloutStatus(t *testing.T) {
 				},
 			},
 			expectedError:        nil,
-			expectedRequeue:      true,
 			expectedRequeueAfter: 5 * time.Second,
 		},
 	}
@@ -145,9 +141,6 @@ func TestCheckDeploymentRolloutStatus(t *testing.T) {
 				t.Errorf("Got error: %v, expected: %v", gotErr, tc.expectedError)
 			}
 
-			if tc.expectedRequeue != result.Requeue {
-				t.Errorf("Got requeue: %v, expected: %v", result.Requeue, tc.expectedRequeue)
-			}
 			if tc.expectedRequeueAfter != result.RequeueAfter.Round(time.Second) {
 				t.Errorf("Got requeueAfter: %v, expected: %v", result.RequeueAfter.Round(time.Second), tc.expectedRequeueAfter)
 			}