Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelawyu committed Dec 19, 2024
1 parent aaf608f commit 378d028
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkg/controllers/work/applier.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ func findConflictedWork(ctx context.Context, hubClient client.Client, namespace
// Make sure these conditions are met before moving
// * the defaulting webhook failure policy is configured as "fail".
// * user cannot update/delete the webhook.

// After the latest API change, Fleet needs to set default values before doing the
// full comparison.
defaulter.SetDefaultsWork(work)
defaulter.SetDefaultsApplyStrategy(strategy)
if !equality.Semantic.DeepEqual(strategy, work.Spec.ApplyStrategy) {
return work, nil
}
Expand Down

0 comments on commit 378d028

Please sign in to comment.