Commit b4cde56

committed

Fix drift correction regression when correctDrift.force is false (rancher#4879)

* Fix drift correction regression when correctDrift.force is false The Helm v4 migration set ServerSideApply to "auto" for non-force rollbacks. This caused Helm to auto-detect and reuse the apply method from the original release, which is SSA. Server-Side Apply tracks field ownership per field manager, so rollback only reverts fields owned by Helm's manager — manual changes owned by a different manager are silently ignored. Setting ServerSideApply to "false" for all rollbacks forces client-side three-way merge, which compares the full resource state and patches all drifted fields regardless of ownership. This restores the Helm v3 behavior. Refers to: rancher#4878 --------- Signed-off-by: Xavi Garcia <xavi.garcia@suse.com>

1 parent 1be8722 commit b4cde56Copy full SHA for b4cde56

3 files changed

integrationtests/agent
- assets
  - deployment-v1.yaml
- bundle_deployment_drift_test.go
internal/helmdeployer
- rollback.go

`‎integrationtests/agent/assets/deployment-v1.yaml‎`

-Original file line number
+Diff line change
 metadata:
   name: svc-test
 spec:
 +  type: ClusterIP
   selector:
     app.kubernetes.io/name: MyApp
   ports:

Comments

(0)