Merge pull request #248 from cloudpilot-ai/cherry-pick-246-release-0.2

Cherry pick PR(246)/fix: re-enqueue not too offen if error happened

Author: Wei

pkg/controllers/nodeclass/status/controller.go

@@ -101,11 +101,11 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeC
 			errs = multierr.Append(errs, client.IgnoreNotFound(err))
 		}
 	}
-
-	if errs != nil {
-		return reconcile.Result{}, errs
+	if result.Min(results...).RequeueAfter > 0 {
+		return result.Min(results...), nil
 	}
-	return result.Min(results...), nil
+
+	return reconcile.Result{}, errs
 }
 
 func (c *Controller) Register(_ context.Context, m manager.Manager) error {

pkg/controllers/nodeclass/status/image.go

@@ -37,7 +37,7 @@ func (i *Image) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeClass)
 	images, err := i.imageProvider.List(ctx, nodeClass)
 	if err != nil {
 		log.FromContext(ctx).Error(err, "failed to list images")
-		return reconcile.Result{}, err
+		return reconcile.Result{RequeueAfter: time.Second * 30}, err
 	}
 
 	if len(images) == 0 {

pkg/controllers/nodeclass/status/securitygroup.go

@@ -34,7 +34,7 @@ type SecurityGroup struct {
 func (sg *SecurityGroup) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeClass) (reconcile.Result, error) {
 	securityGroups, err := sg.securityGroupProvider.List(ctx, nodeClass)
 	if err != nil {
-		return reconcile.Result{}, fmt.Errorf("getting security groups, %w", err)
+		return reconcile.Result{RequeueAfter: time.Second * 30}, fmt.Errorf("getting security groups, %w", err)
 	}
 	if len(securityGroups) == 0 && len(nodeClass.Spec.SecurityGroupSelectorTerms) > 0 {
 		nodeClass.Status.SecurityGroups = nil

pkg/controllers/nodeclass/status/vswitch.go

@@ -37,7 +37,7 @@ type VSwitch struct {
 func (v *VSwitch) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeClass) (reconcile.Result, error) {
 	vSwitches, err := v.vSwitchProvider.List(ctx, nodeClass)
 	if err != nil {
-		return reconcile.Result{}, fmt.Errorf("getting vSwitches, %w", err)
+		return reconcile.Result{RequeueAfter: time.Second * 30}, fmt.Errorf("getting vSwitches, %w", err)
 	}
 	if len(vSwitches) == 0 {
 		nodeClass.Status.VSwitches = nil