Skip to content

Commit 9681880

Browse files
authored
remove 'helm' from the list of reclaimed field managers (#268)
1 parent 6729f1f commit 9681880

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/reconciler/reconciler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func NewReconciler(name string, clnt cluster.Client, options ReconcilerOptions)
229229
// - if the effective update policy is UpdatePolicyReplace, a http PUT request will be sent to the Kubernetes API
230230
// - if the effective update policy is UpdatePolicySsaMerge or UpdatePolicySsaOverride, a server-side-apply http PATCH request will be sent;
231231
// while UpdatePolicySsaMerge just implements the Kubernetes standard behavior (leaving foreign non-conflicting fields untouched), UpdatePolicySsaOverride
232-
// will re-claim (and therefore potentially drop) fields owned by certain field managers, such as kubectl and helm
232+
// will re-claim (and therefore potentially drop) fields owned by certain field managers, such as kubectl
233233
// - if the effective update policy is UpdatePolicyRecreate, the object will be deleted and recreated.
234234
//
235235
// Objects will be applied and deleted in waves, according to their apply/delete order. Objects which specify a purge order will be deleted from the cluster at the
@@ -1104,7 +1104,7 @@ func (r *Reconciler) createObject(ctx context.Context, object client.Object, cre
11041104
// if updatePolicy equals UpdatePolicyReplace, an update (put) will be performed; finalizers of existingObject will be copied;
11051105
// if updatePolicy equals UpdatePolicySsaMerge, a conflict-forcing server-side-apply patch will be performed;
11061106
// if updatePolicy equals UpdatePolicySsaOverride, then in addition, a preparation patch request will be performed before doing the conflict-forcing
1107-
// server-side-apply patch; this preparation patch will adjust managedFields, reclaiming fields/values previously owned by kubectl or helm
1107+
// server-side-apply patch; this preparation patch will adjust managedFields, reclaiming fields/values previously owned by kubectl
11081108
func (r *Reconciler) updateObject(ctx context.Context, object client.Object, existingObject *unstructured.Unstructured, updatedObject any, updatePolicy UpdatePolicy) (err error) {
11091109
if counter := r.metrics.UpdateCounter; counter != nil {
11101110
counter.Inc()
@@ -1152,7 +1152,7 @@ func (r *Reconciler) updateObject(ctx context.Context, object client.Object, exi
11521152
var replacedFieldManagerPrefixes []string
11531153
if updatePolicy == UpdatePolicySsaOverride {
11541154
// TODO: add ways (per reconciler, per component, per object) to configure the list of field manager (prefixes) which are reclaimed
1155-
replacedFieldManagerPrefixes = []string{"kubectl", "helm"}
1155+
replacedFieldManagerPrefixes = []string{"kubectl"}
11561156
}
11571157
// note: even if replacedFieldManagerPrefixes is empty, replaceFieldManager() will reclaim fields created by us through an Update operation,
11581158
// that is through a create or update call; this may be necessary, if the update policy for the object changed (globally or per-object)

0 commit comments

Comments
 (0)