Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to warning in case of resource origin clash. #10947

Merged
merged 2 commits into from
Mar 8, 2022
Merged

Switch to warning in case of resource origin clash. #10947

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d39a20
Switch to warning in case of resource origin clash.
Tener Mar 8, 2022
60e5074
Merge branch 'master' into tener/10797_warn_on_ignored_resource
Tener Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/services/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ func (r *Reconciler) processNewResource(ctx context.Context, currentResources ty
return nil
}

// Don't overwrite resource of a different origin.
// Don't overwrite resource of a different origin (e.g., keep static resource from config and ignore dynamic resource)
if registered.Origin() != new.Origin() {
r.log.Debugf("%v has different origin (%v vs %v), not updating.", new.GetName(),
r.log.Warnf("%v has different origin (%v vs %v), not updating.", new.GetName(),
new.Origin(), registered.Origin())
return nil
}
Expand Down