fix update and apply

Author: Kevin Wiesmueller

merge/update.go

@@ -80,10 +80,11 @@ func (s *Updater) update(oldObject, newObject *typed.TypedValue, version fieldpa
 			if err != nil {
 				return nil, nil, fmt.Errorf("failed to compare objects: %v", err)
 			}
-			compare.Remove(ignored)
 			versions[managerSet.APIVersion()] = compare
 		}
 
+		compare.Remove(ignored)
+
 		conflictSet := managerSet.Set().Intersection(compare.Modified.Union(compare.Added))
 		if !conflictSet.Empty() {
 			conflicts[manager] = fieldpath.NewVersionedSet(conflictSet, managerSet.APIVersion(), false)
@@ -136,8 +137,11 @@ func (s *Updater) Update(liveObject, newObject *typed.TypedValue, version fieldp
 	if _, ok := managers[manager]; !ok {
 		managers[manager] = fieldpath.NewVersionedSet(fieldpath.NewSet(), version, false)
 	}
+	if ignored == nil {
+		ignored = fieldpath.NewSet()
+	}
 	managers[manager] = fieldpath.NewVersionedSet(
-		managers[manager].Set().Union(compare.Modified).Union(compare.Added).Difference(compare.Removed),
+		managers[manager].Set().Union(compare.Modified).Union(compare.Added).Difference(compare.Removed).RecursiveDifference(ignored),
 		version,
 		false,
 	)
@@ -172,12 +176,16 @@ func (s *Updater) Apply(liveObject, configObject *typed.TypedValue, version fiel
 	}
 	lastSet := managers[manager]
 	set, err := configObject.ToFieldSet()
-	if ignored != nil {
-		set = set.RecursiveDifference(ignored)
-	}
 	if err != nil {
 		return nil, fieldpath.ManagedFields{}, fmt.Errorf("failed to get field set: %v", err)
 	}
+	if ignored != nil {
+		set = set.RecursiveDifference(ignored)
+		// TODO: is this correct. If we don't remove from lastSet pruning might remove the fields?
+		if lastSet != nil {
+			lastSet.Set().RecursiveDifference(ignored)
+		}
+	}
 	managers[manager] = fieldpath.NewVersionedSet(set, version, true)
 	newObject, err = s.prune(newObject, managers, manager, lastSet)
 	if err != nil {

typed/comparison_test.go

@@ -146,6 +146,30 @@ func TestComparisonRemove(t *testing.T) {
 				Removed:  fieldpath.NewSet(),
 			},
 		},
+		{
+			name: "removes simple path",
+			Comparison: &typed.Comparison{
+				Added: fieldpath.NewSet(
+					fieldpath.MakePathOrDie("a"),
+				),
+				Modified: fieldpath.NewSet(
+					fieldpath.MakePathOrDie("b"),
+				),
+				Removed: fieldpath.NewSet(
+					fieldpath.MakePathOrDie("c"),
+				),
+			},
+			Remove: fieldpath.NewSet(
+				fieldpath.MakePathOrDie("a"),
+				fieldpath.MakePathOrDie("b"),
+				fieldpath.MakePathOrDie("c"),
+			),
+			Expect: &typed.Comparison{
+				Added:    fieldpath.NewSet(),
+				Modified: fieldpath.NewSet(),
+				Removed:  fieldpath.NewSet(),
+			},
+		},
 	}
 
 	for _, c := range cases {