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

install: don't delete the 'aws-node' DaemonSet #208

Merged
merged 1 commit into from
Jun 24, 2021

Conversation

bmcustodio
Copy link
Contributor

@bmcustodio bmcustodio commented May 3, 2021

Instead of deleting the aws-node DaemonSet, which is permanent, we can be gentler and just evict its pods by setting a node selector that won't ever be matched (unless someone wants it to by explicitly setting the required label on a node).

This allows cilium uninstall to gracefully revert the aws-node DaemonSet to its previous state, as it might contain customizations that would otherwise be lost.

@bmcustodio bmcustodio temporarily deployed to ci May 3, 2021 14:19 Inactive
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

This is very nice! 🚀

Could we test it by adding a check in the EKS workflows, to verify the aws-node DaemonSet's pods exists after Cilium is uninstalled? Or is it not worth it?

@tklauser
Copy link
Member

Hi @bmcustodio. Could you please rebase the PR branch against latest master? This should hopefully get rid of most of the test flakes.

Also there's a review remark from @pchaigno which you might want to address, if feasible?

Instead of deleting the 'aws-node' DaemonSet, which is permanent, we
can be gentler and just evict its pods by setting a node selector that
won't ever be matched (unless someone wants it to by explicitly setting
the required label).

This allows 'cilium uninstall' to gracefully revert the 'aws-node'
DaemonSet to its previous state, as it might contain customizations
that would otherwise be lost.

Signed-off-by: Bruno Miguel Custódio <[email protected]>
@bmcustodio bmcustodio force-pushed the bmcustodio-no-delete-aws-node branch from b7af12c to 7c26ae4 Compare June 24, 2021 10:49
@bmcustodio bmcustodio requested review from a team as code owners June 24, 2021 10:49
@bmcustodio
Copy link
Contributor Author

bmcustodio commented Jun 24, 2021

@tklauser @pchaigno sorry for totally missing this review 🤦🏼 I've added said check — I think it makes total sense — and rebased!

@tklauser
Copy link
Member

For some reason the GitHub actions weren't triggered when you pushed a new version. I'll close and re-open the PR hoping that this will trigger the tests.

@tklauser tklauser closed this Jun 24, 2021
@tklauser tklauser reopened this Jun 24, 2021
@tklauser tklauser temporarily deployed to ci June 24, 2021 14:08 Inactive
@tklauser
Copy link
Member

Seems to have worked 🎉

@joestringer
Copy link
Member

AKS failure is only due to the PR being opened from outside the cilium-cli repo. The code changes themselves only touch the EKS-specific jobs and codepaths so there should be no regression in the AKS job. Should be good to merge.

@joestringer joestringer added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 24, 2021
@tklauser tklauser merged commit 619f9d5 into cilium:master Jun 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants