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

policy: Fix mapstate changes error in entry change comparison #29815

Merged
merged 1 commit into from
Dec 19, 2023
Merged

policy: Fix mapstate changes error in entry change comparison #29815

merged 1 commit into from
Dec 19, 2023

Conversation

jrajahalme
Copy link
Member

Datapath equalness of the old and new entry must be evaluated before entries are merged, afterwards the entries will be the same and the key is not added in ChangeState.Adds, which may lead to a policy map entry not being updated during incremental updates.

Fixes: #26331

@jrajahalme
policy: Fix mapstate changes error in entry change comparison
d511290 
Datapath equalness of the old and new entry must be evaluated before
entries are merged, afterwards the entries will be the same and the key
is not added in ChangeState.Adds, which may lead to a policy map entry
not being updated during incremental updates.

Fixes: cilium#26331

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
@jrajahalme jrajahalme added kind/bug This is a bug in the Cilium logic. release-note/misc This PR makes changes that have no direct user impact. release-blocker/1.15 This issue will prevent the release of the next version of Cilium. labels Dec 12, 2023
@jrajahalme jrajahalme requested a review from a team as a code owner December 12, 2023 12:06
@jrajahalme
Copy link
Member Author

/test

@jrajahalme
Copy link
Member Author

Carved this bug fix out from #28555 that missed the feature freeze deadline.

@jrajahalme jrajahalme mentioned this pull request Dec 12, 2023
Merged
@jrajahalme jrajahalme added needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch release-blocker/1.14 This issue will prevent the release of the next version of Cilium. affects/v1.14 This issue affects v1.14 branch labels Dec 12, 2023
@joestringer joestringer added release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/misc This PR makes changes that have no direct user impact. labels Dec 12, 2023
@jrajahalme jrajahalme added the needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch label Dec 13, 2023
@jrajahalme
Copy link
Member Author

/ci-ginkgo

@joestringer joestringer added this to Needs backport from main in v1.15.0-rc.1 Dec 14, 2023
@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 Dec 19, 2023
@julianwiedmann julianwiedmann added this pull request to the merge queue Dec 19, 2023
Merged via the queue into cilium:main with commit 3d3f69c Dec 19, 2023
63 checks passed
@YutaroHayakawa YutaroHayakawa mentioned this pull request Dec 20, 2023
Closed
8 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Dec 20, 2023
@YutaroHayakawa YutaroHayakawa mentioned this pull request Dec 20, 2023
Merged
6 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Dec 20, 2023
@pippolo84 pippolo84 mentioned this pull request Jan 2, 2024
Merged
17 tasks
@pippolo84 pippolo84 added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Jan 2, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Jan 12, 2024
@aanm aanm added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Jan 16, 2024
@aanm aanm mentioned this pull request Jan 16, 2024
Merged
@gentoo-root gentoo-root mentioned this pull request Jan 17, 2024
Merged
@aanm aanm moved this from Needs backport from main to Backport done to v1.15 in v1.15.0-rc.1 Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nathanjsweet nathanjsweet nathanjsweet approved these changes

Assignees
No one assigned
Labels
affects/v1.14 This issue affects v1.14 branch backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-blocker/1.14 This issue will prevent the release of the next version of Cilium. release-blocker/1.15 This issue will prevent the release of the next version of Cilium. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
cilium v1.14.6
Status: Released
v1.15.0-rc.1
Backport done to v1.15
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jrajahalme @nathanjsweet @joestringer @pippolo84 @aanm @YutaroHayakawa @julianwiedmann