-
Notifications
You must be signed in to change notification settings - Fork 229
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove bd update workaround from drift detection (#2942)
This adds a new reconciler, which reacts to a channel source, to remove the bd update workaround. The driftdetect mini controller previously signaled change via the bundledeployment's status to the controller-runtime based reconciler. The bundledeployment reconciler is now split into two, one reconciler to install bundles and another to handle drift. Both can update the status of the bundledeployment resource with the current state of the deployment.
- Loading branch information
Showing
7 changed files
with
195 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/rancher/fleet/internal/cmd/agent/deployer" | ||
| "github.com/rancher/fleet/internal/cmd/agent/deployer/driftdetect" | ||
| "github.com/rancher/fleet/internal/cmd/agent/deployer/monitor" | ||
| fleetv1 "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1" | ||
|
|
||
| "github.com/rancher/wrangler/v3/pkg/condition" | ||
|
|
||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| errutil "k8s.io/apimachinery/pkg/util/errors" | ||
| "k8s.io/client-go/util/retry" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/log" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
| ) | ||
|
|
||
| type DriftReconciler struct { | ||
| client.Client | ||
| Scheme *runtime.Scheme | ||
|
|
||
| Deployer *deployer.Deployer | ||
| Monitor *monitor.Monitor | ||
| DriftDetect *driftdetect.DriftDetect | ||
|
|
||
| DriftChan chan event.GenericEvent | ||
| } | ||
|
|
||
| // SetupWithManager sets up the controller with the Manager. | ||
| func (r *DriftReconciler) SetupWithManager(mgr ctrl.Manager) error { | ||
| src := source.Channel(r.DriftChan, &handler.EnqueueRequestForObject{}) | ||
| return ctrl.NewControllerManagedBy(mgr). | ||
| Named("drift-reconciler"). | ||
| WatchesRawSource(src). | ||
| Complete(r) | ||
|
|
||
| } | ||
|
|
||
| // Reconcile is triggered via a channel from the driftdetect mini controller, | ||
| // which watches deployed resources for drift. It does so by creating a plan | ||
| // and comparing it to the current state. | ||
| // It will update the status of the BundleDeployment and correct drift if enabled. | ||
| // | ||
| // For more details, check Reconcile and its Result here: | ||
| // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile | ||
| func (r *DriftReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| logger := log.FromContext(ctx).WithName("drift") | ||
| ctx = log.IntoContext(ctx, logger) | ||
|
|
||
| // get latest BundleDeployment from cluster | ||
| bd := &fleetv1.BundleDeployment{} | ||
| err := r.Get(ctx, req.NamespacedName, bd) | ||
| if apierrors.IsNotFound(err) { | ||
| return ctrl.Result{}, nil | ||
| } else if err != nil { | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| if bd.Spec.Paused { | ||
| logger.V(1).Info("Bundle paused, clearing drift detection") | ||
| err := r.DriftDetect.Clear(req.String()) | ||
|
|
||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| merr := []error{} | ||
|
|
||
| // retrieve the resources from the helm history. | ||
| // if we can't retrieve the resources, we don't need to try any of the other operations and requeue now | ||
| resources, err := r.Deployer.Resources(bd.Name, bd.Status.Release) | ||
| if err != nil { | ||
| logger.V(1).Info("Failed to retrieve bundledeployment's resources") | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| // return early if the bundledeployment is still being installed | ||
| if !monitor.ShouldUpdateStatus(bd) { | ||
| return ctrl.Result{}, nil | ||
| } | ||
|
|
||
| // update the bundledeployment status from the helm resource list | ||
| bd.Status, err = r.Monitor.UpdateStatus(ctx, bd, resources) | ||
| if err != nil { | ||
| logger.Error(err, "Cannot monitor deployed bundle") | ||
| } | ||
|
|
||
| // run drift correction | ||
| if len(bd.Status.ModifiedStatus) > 0 && bd.Spec.CorrectDrift != nil && bd.Spec.CorrectDrift.Enabled { | ||
| if release, err := r.Deployer.RemoveExternalChanges(ctx, bd); err != nil { | ||
| merr = append(merr, fmt.Errorf("failed reconciling drift: %w", err)) | ||
| // Propagate drift correction error to bundle deployment status. | ||
| condition.Cond(fleetv1.BundleDeploymentConditionReady).SetError(&bd.Status, "", err) | ||
| } else { | ||
| bd.Status.Release = release | ||
| } | ||
| } | ||
|
|
||
| // final status update | ||
| logger.V(1).Info("Reconcile finished, updating the bundledeployment status") | ||
| err = r.updateStatus(ctx, req.NamespacedName, bd.Status) | ||
| 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)) | ||
| } | ||
|
|
||
| return ctrl.Result{}, errutil.NewAggregate(merr) | ||
| } | ||
|
|
||
| func (r *DriftReconciler) updateStatus(ctx context.Context, req types.NamespacedName, status fleetv1.BundleDeploymentStatus) error { | ||
| return retry.RetryOnConflict(DefaultRetry, func() error { | ||
| newBD := &fleetv1.BundleDeployment{} | ||
| err := r.Get(ctx, req, newBD) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| newBD.Status = status | ||
| return r.Status().Update(ctx, newBD) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.