[0.9] Honor Helm's MaxHistory when using drift correction

e2e/drift/drift_test.go

@@ -151,6 +151,11 @@ var _ = Describe("Drift", func() {
 					_ = json.Unmarshal([]byte(out), &configMap)
 					return configMap.Data["foo"] == "bar"
 				}).Should(BeTrue())
+				Expect(func() string {
+					kw := k.Namespace(namespace)
+					n, _ := kw.Get("secrets", "--field-selector=type=helm.sh/release.v1", "-o=go-template='{{printf \"%d\\n\" (len  .items)}}'")
+					return n
+				}).Should(Equal("2")) // Max Helm history
 			})
 		})
 

internal/cmd/agent/deployer/monitor.go

@@ -175,7 +175,7 @@ func (m *Manager) UpdateBundleDeploymentStatus(mapper meta.RESTMapper, bd *fleet
 	if len(bd.Status.ModifiedStatus) == 0 {
 		bd.Status.NonModified = true
 	} else if bd.Spec.CorrectDrift != nil && bd.Spec.CorrectDrift.Enabled {
-		err = m.deployer.RemoveExternalChanges(bd)
+		release, err := m.deployer.RemoveExternalChanges(bd)
 		if err != nil {
 			// Update BundleDeployment status as wrangler doesn't update the status if error is not nil.
 			_, errStatus := m.bundleDeploymentController.UpdateStatus(bd)
@@ -184,6 +184,7 @@ func (m *Manager) UpdateBundleDeploymentStatus(mapper meta.RESTMapper, bd *fleet
 			}
 			return errors.Wrapf(err, "error reconciling drift")
 		}
+		bd.Status.Release = release
 	}
 
 	bd.Status.Resources = []fleet.BundleDeploymentResource{}

internal/helmdeployer/deployer.go

@@ -246,30 +246,40 @@ func (h *Helm) Deploy(bundleID string, manifest *manifest.Manifest, options flee
 
 // RemoveExternalChanges does a helm rollback to remove changes made outside of fleet.
 // It removes the helm history entry if the rollback fails.
-func (h *Helm) RemoveExternalChanges(bd *fleet.BundleDeployment) error {
+func (h *Helm) RemoveExternalChanges(bd *fleet.BundleDeployment) (string, error) {
 	logrus.Infof("Drift correction: rollback BundleDeployment %s", bd.Name)
 
 	_, defaultNamespace, releaseName := h.getOpts(bd.Name, bd.Spec.Options)
 	cfg, err := h.getCfg(defaultNamespace, bd.Spec.Options.ServiceAccount)
 	if err != nil {
-		return err
+		return "", err
 	}
 	currentRelease, err := cfg.Releases.Last(releaseName)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	r := action.NewRollback(&cfg)
 	r.Version = currentRelease.Version
+	r.MaxHistory = bd.Spec.Options.Helm.MaxHistory
+	if r.MaxHistory == 0 {
+		r.MaxHistory = MaxHelmHistory
+	}
 	if bd.Spec.CorrectDrift.Force {
 		r.Force = true
 	}
-	err = r.Run(releaseName)
-	if err != nil && !bd.Spec.CorrectDrift.KeepFailHistory {
-		return removeFailedRollback(cfg, currentRelease, err)
+	if err = r.Run(releaseName); err != nil {
+		if bd.Spec.CorrectDrift.KeepFailHistory {
+			return "", err
+		}
+		return "", removeFailedRollback(cfg, currentRelease, err)
 	}
 
-	return err
+	release, err := cfg.Releases.Last(releaseName)
+	if err != nil {
+		return "", err
+	}
+	return releaseToResourceID(release), nil
 }
 
 func (h *Helm) mustUninstall(cfg *action.Configuration, releaseName string) (bool, error) {
@@ -878,13 +888,17 @@ func mergeValues(dest, src map[string]interface{}) map[string]interface{} {
 	return dest
 }
 
+func releaseToResourceID(release *release.Release) string {
+	return fmt.Sprintf("%s/%s:%d", release.Namespace, release.Name, release.Version)
+}
+
 func releaseToResources(release *release.Release) (*Resources, error) {
 	var (
 		err error
 	)
 	resources := &Resources{
 		DefaultNamespace: release.Namespace,
-		ID:               fmt.Sprintf("%s/%s:%d", release.Namespace, release.Name, release.Version),
+		ID:               releaseToResourceID(release),
 	}
 
 	resources.Objects, err = yaml.ToObjects(bytes.NewBufferString(release.Manifest))