Skip to content

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Oct 28, 2024

Once this PR is merged, a GitHub action will update the labels of these PRs:

 35364

@giorio94 giorio94 added kind/backports This PR provides functionality previously merged into master. backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. labels Oct 28, 2024
[ upstream commit e2b17ec ]

[ backporter's notes: adapted the path as the v1.16 tree still used
  logrus rather than slog; adapted the unit test to reflect the
  different output format (most notably, the lowercase keywords and
  the different key-values pairs order). ]

Controller runtime emits an error log whenever a reconcile function
terminates with an error. However, reconciliation errors are harmless
in most cases, as the subsequent iteration will normally pull the
updated state and succeed. Still, this breaks the Cilium's assumption
that error logs are emitted only in case of serious conditions,
causing potential user confusion, as well as triggering the error
logs check run as part of the E2E tests.

Let's introduce a wrapper responsible for converting "Reconciler error"
messages to info level logs, when the returned error is likely to be
transient. We specifically check the error type to avoid hiding unexpected
ones, although more types could be added in the future if deemed helpful.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 force-pushed the pr/v1.16-backport-2024-10-28-02-38 branch from 7f4ceb7 to ae1efca Compare October 28, 2024 13:53
@giorio94
Copy link
Member Author

/test-backport-1.16

@giorio94 giorio94 requested a review from sayboras October 28, 2024 15:44
@giorio94
Copy link
Member Author

Added Tam as reviewer for a sanity check, as you have already reviewed the upstream PR.

@giorio94 giorio94 marked this pull request as ready for review October 28, 2024 15:45
@giorio94 giorio94 requested a review from a team as a code owner October 28, 2024 15:45
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks and lgtm ✅

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 30, 2024
@sayboras sayboras added this pull request to the merge queue Oct 30, 2024
Merged via the queue into v1.16 with commit 1592520 Oct 30, 2024
278 of 279 checks passed
@sayboras sayboras deleted the pr/v1.16-backport-2024-10-28-02-38 branch October 30, 2024 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants