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

Ensure containerd service unmasking #8726

Merged
merged 4 commits into from
Apr 29, 2022

Conversation

rickerc
Copy link
Contributor

@rickerc rickerc commented Apr 18, 2022

Force systemd to unmask and start service when adding containerd systemd service

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug

/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

Ensures that the systemd containerd service is not masked when kubespray adds it, regardless of the initial system state (without this, transitioning from OS-deployed systemd-managed containerd to kubespray deployed systemd-managed containerd can fail because the kubespray uninstall of the OS deployment of containerd leaves the service masked in systemd)

Which issue(s) this PR fixes:

Fixes #8725 #8734

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

[containerd] Ensure containerd service unmasking

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Apr 18, 2022
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Apr 18, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: rickerc / name: Chris Ricker (db3f82b)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 18, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @rickerc!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @rickerc. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 18, 2022
@k8s-ci-robot k8s-ci-robot requested review from EppO and jayonlau April 18, 2022 20:35
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 18, 2022
@rickerc
Copy link
Contributor Author

rickerc commented Apr 26, 2022

/retest

@k8s-ci-robot
Copy link
Contributor

@rickerc: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cristicalin
Copy link
Contributor

@rickerc please see the related issue #8734 which appears to be related. I'm guessing the reset operation also causes similar symptoms to what you experienced so we should try to fix this for all CRIs, not just containerd.

Secondly, due to the CI outage of the last couple of days you will need to close and re-open the PR so the new CI creates a new pipeline.

@cristicalin
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 27, 2022
@rickerc
Copy link
Contributor Author

rickerc commented Apr 27, 2022

Unmasking added for a couple of other runtimes to help with #8734

At least with containerd the masking is specifically needed because of the combination of apt and the workflow of the containerd deployment ansible which does:

  1. stop apt-installed runtime
    
  2. uninstall apt-installed runtime
    
  3. download known good binary
    
  4. register known good as systemd service
    
  5. systemd start systemd service then fails because step 2 above left service masked
    

It won't be universal to all the runtimes because the runtime install ansible doesn't always follow the above flow, etc. I don't think this will be seen on rpm based distros either -- might vary with rpm version but at least in light testing I only see the above 5 steps fail with ubuntu not rhel

@cristicalin
Copy link
Contributor

Thanks for doing this @rickerc !
Note, you might need to rebase this PR on the latest master branch for the CI jobs to complete.

rickerc added 3 commits April 28, 2022 06:38
Force systemd to unmask and start service when adding containerd service
Switch to start instead of restart
Move unmasking to restart handler
@cristicalin
Copy link
Contributor

Thanks for doing this @rickerc !

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2022
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/lgtm

Thank you @rickerc

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 29, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, floryut, rickerc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [cristicalin,floryut]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 21fc197 into kubernetes-sigs:master Apr 29, 2022
@floryut floryut added kind/network Network section in the release note and removed kind/bug Categorizes issue or PR as related to a bug. labels May 2, 2022
@oomichi oomichi mentioned this pull request May 28, 2022
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 30, 2023
* Force containerd service unmasking

Force systemd to unmask and start service when adding containerd service

* Eliminate restart and move unmasking step

Switch to start instead of restart
Move unmasking to restart handler

* Add unmasking to similar container runtimes

* Add missing service names
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 23, 2023
* Force containerd service unmasking

Force systemd to unmask and start service when adding containerd service

* Eliminate restart and move unmasking step

Switch to start instead of restart
Move unmasking to restart handler

* Add unmasking to similar container runtimes

* Add missing service names
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/network Network section in the release note lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kubespray masks containerd when containerd already running
4 participants