pkg/k8s: ignore status field in CNP DeepEqual #12171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The status field should be ignored when comparing 2 CNPs as this field does not matter to the policy enforcement of the CNP. This fixes a bug introduced by 134fdb5 which make Cilium to process all CNP events from k8s including the ones where a status was the only field modified. This made a cluster with 2 or more nodes to concurrently trying the update its own status in the CNP causing the other node to receive and process the CNP event. Fixes: 134fdb5 ("k8s/watchers: fix missing missing CNP/CCNP updates") Signed-off-by: André Martins <andre@cilium.io>
aanm
added
priority/release-blocker
sig/k8s
|
test-me-please |
tklauser
approved these changes
Jun 18, 2020
Comment on lines
+78
to
+79
| // DeepEqual compares 2 CNPs while ignoring the LastAppliedConfigAnnotation and | ||
| // ignoring the Status field of the CNP. |
There was a problem hiding this comment.
Nit:
Suggested change
| // DeepEqual compares 2 CNPs while ignoring the LastAppliedConfigAnnotation and | |
| // ignoring the Status field of the CNP. | |
| // DeepEqual compares 2 CNPs while ignoring the LastAppliedConfigAnnotation and | |
| // Status fields of the CNP. |
tgraf
approved these changes
Jun 18, 2020
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.8
in 1.8.0
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.8
in 1.8.0
maintainer-s-little-helper
bot
moved this from Backport pending to v1.8
to Backport done to v1.8
in 1.8.0
maintainer-s-little-helper
bot
moved this from Backport pending to v1.8
to Backport done to v1.8
in 1.8.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The status field should be ignored when comparing 2 CNPs as this field
does not matter to the policy enforcement of the CNP.
This fixes a bug introduced by 134fdb5 which make Cilium to process
all CNP events from k8s including the ones where a status was the only
field modified. This made a cluster with 2 or more nodes to concurrently
trying the update its own status in the CNP causing the other node to
receive and process the CNP event.
Fixes: 134fdb5 ("k8s/watchers: fix missing missing CNP/CCNP updates")
Signed-off-by: André Martins andre@cilium.io