Skip to content

Prevent empty Patch updates from Drift reconciler #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −8
Open

Prevent empty Patch updates from Drift reconciler #3555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions internal/cmd/agent/controller/drift_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/rancher/fleet/internal/cmd/agent/deployer/monitor"
fleetv1 "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"

"github.com/go-logr/logr"
"github.com/rancher/wrangler/v3/pkg/condition"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -121,19 +122,34 @@ func (r *DriftReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
}

// final status update
statusPatch := client.MergeFrom(orig)
err = r.Status().Patch(ctx, bd, statusPatch)
if apierrors.IsNotFound(err) {
merr = append(merr, fmt.Errorf("bundledeployment has been deleted: %w", err))
} else if err != nil {
merr = append(merr, fmt.Errorf("failed final update to bundledeployment status: %w", err))
} else {
logger.V(1).Info("Reconcile finished, bundledeployment status updated", "statusPatch", statusPatch)
if err := r.updateStatus(ctx, logger, orig, bd); err != nil {
if apierrors.IsNotFound(err) {
merr = append(merr, fmt.Errorf("bundledeployment has been deleted: %w", err))
} else {
merr = append(merr, fmt.Errorf("failed final update to bundledeployment status: %w", err))
}
}

return ctrl.Result{}, errutil.NewAggregate(merr)
}

func (r *DriftReconciler) updateStatus(ctx context.Context, logger logr.Logger, orig *fleetv1.BundleDeployment, obj *fleetv1.BundleDeployment) error {
statusPatch := client.MergeFrom(orig)

// Pre-calculate patch contents, to skip request if it's empty
patchData, err := statusPatch.Data(obj)
if err == nil && string(patchData) == "{}" {
return nil
}

if err := r.Status().Patch(ctx, obj, statusPatch); err != nil {
return err
}

logger.V(1).Info("Reconcile finished, bundledeployment status updated", "statusPatch", string(patchData))
return nil
}

// enqueueRequestHandlerWithDelay implements a TypedEventHandler that introduces a constant delay in the resources being enqueued
// Due to how workqueue.TypedDelayingInterface's AddAfter is implemented, successive calls with the same key are aggregated.
// Only implemented for Generic events, as this is only meant to be used from with source.Channel to receive internal events, not from an informer
Expand Down
Loading