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.

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

pkg/k8s: re-add CiliumIsUp Node condition even if removed #16857

Merged
merged 1 commit into from Jul 14, 2021

Conversation

aanm
Copy link
Member

@aanm aanm commented Jul 12, 2021

If the CiliumIsUp Node condition is removed either by accident or due
a concurrency issue when updating the node from different entities,
Cilium is now able to re-add the node condition back to the node again.

Fixes: bd34b95 ("pkg/k8s: remove node.cilium.io/agent-not-ready taint from nodes")
Signed-off-by: André Martins andre@cilium.io

Fixes #16846

@aanm aanm added release-note/misc This PR makes changes that have no direct user impact. release-blocker/1.10 labels Jul 12, 2021
@aanm aanm requested review from a team and brb July 12, 2021 14:11
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.3 Jul 12, 2021
@aanm aanm added the sig/k8s Impacts the kubernetes API, or kubernetes -> cilium internals translation layers. label Jul 12, 2021
@aanm aanm changed the title pkg/k8s: re-add CiliumIsUp Node condition even if it removed pkg/k8s: re-add CiliumIsUp Node condition even if it is removed Jul 12, 2021
@aanm aanm changed the title pkg/k8s: re-add CiliumIsUp Node condition even if it is removed pkg/k8s: re-add CiliumIsUp Node condition even if removed Jul 12, 2021
@aanm
Copy link
Member Author

aanm commented Jul 12, 2021

test-me-please

If the CiliumIsUp Node condition is removed either by accident or due
a concurrency issue when updating the node from different entities,
Cilium is now able to re-add the node condition back to the node again.

Fixes: bd34b95 ("pkg/k8s: remove node.cilium.io/agent-not-ready taint from nodes")
Signed-off-by: André Martins <andre@cilium.io>
@aanm
Copy link
Member Author

aanm commented Jul 14, 2021

retesting to pick up #16868

@aanm
Copy link
Member Author

aanm commented Jul 14, 2021

test-me-please

@aanm
Copy link
Member Author

aanm commented Jul 14, 2021

hit #16399, merging

@aanm aanm merged commit 54ae42b into cilium:master Jul 14, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.3 Jul 14, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.3 Jul 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact. sig/k8s Impacts the kubernetes API, or kubernetes -> cilium internals translation layers.
Projects
No open projects
1.10.3
Backport done to v1.10
Development

Successfully merging this pull request may close these issues.

Cilium latest doesn't handle "network-unavailable" taint correctly
2 participants