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

[2.17] Fix containerd failed to start if apparmor is not installed #8042

Merged
merged 2 commits into from
Oct 1, 2021
Merged

[2.17] Fix containerd failed to start if apparmor is not installed #8042

merged 2 commits into from
Oct 1, 2021

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Oct 1, 2021 •
edited
Loading

/kind bug

What this PR does / why we need it:

Backport of #8011 and #8036 to v2.17.x

Which issue(s) this PR fixes:

Fixes #7965

rtsp added 2 commits October 1, 2021 16:59
@rtsp @sathieu
Ensure apparmor is installed (kubernetes-sigs#8011)
73f875a 
Kubespray deployment failed when using containerd backend on nodes that apparmor was not installed or previously removed. This PR ensure apparmor is installed by adding it into required_pkgs var.

(cherry picked from commit 4bace24)
@rtsp @sathieu
Ensure apparmor is installed (kubernetes-sigs#8036)
a6607e6 
Kubespray deployment failed when using containerd backend on nodes that apparmor was not installed or previously removed. This PR ensure apparmor is installed by adding it into required_pkgs var.

(cherry picked from commit af04906)
@k8s-ci-robot
Copy link
Contributor

Hi @sathieu. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 1, 2021
@sathieu sathieu changed the base branch from release-2.7 to release-2.17 October 1, 2021 15:04
@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Oct 1, 2021
@k8s-ci-robot
Copy link
Contributor

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the kubernetes-sigs org. You can then trigger verification by writing /verify-owners in a comment.

  • simon
    • User is not a member of the org. Satisfy at least one of these conditions to make the user trusted.
    • roles/network_plugin/macvlan/OWNERS
  • thomeced
    • User is not a member of the org. Satisfy at least one of these conditions to make the user trusted.

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 1, 2021
@sathieu sathieu changed the title Fix containerd failed to start if apparmor is not installed v2.17.x: Fix containerd failed to start if apparmor is not installed Oct 1, 2021
@sathieu sathieu mentioned this pull request Oct 1, 2021
Merged
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 1, 2021
@sathieu
Copy link
Contributor Author

sathieu commented Oct 1, 2021

/assign @woopstar

@rtsp rtsp mentioned this pull request Oct 1, 2021
Closed
@floryut floryut removed the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Oct 1, 2021
floryut
floryut approved these changes Oct 1, 2021
View reviewed changes
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.

/ok-to-test
/lgtm

@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 Oct 1, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 1, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, sathieu

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:

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 1, 2021
@floryut floryut changed the title v2.17.x: Fix containerd failed to start if apparmor is not installed [2.17] Fix containerd failed to start if apparmor is not installed Oct 1, 2021
@oomichi
Copy link
Contributor

oomichi commented Oct 1, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot merged commit 87fee0c into kubernetes-sigs:release-2.17 Oct 1, 2021
@sathieu sathieu deleted the apparmor_v2.17 branch January 6, 2022 09:48
otani88 pushed a commit to velas/kubespray that referenced this pull request Mar 5, 2022
@sathieu @rtsp @otani88
[2.17] Fix containerd failed to start if apparmor is not installed (k…
bb2724a 
…ubernetes-sigs#8042)

* Ensure apparmor is installed (kubernetes-sigs#8011)

Kubespray deployment failed when using containerd backend on nodes that apparmor was not installed or previously removed. This PR ensure apparmor is installed by adding it into required_pkgs var.

(cherry picked from commit 4bace24)

* Ensure apparmor is installed (kubernetes-sigs#8036)

Kubespray deployment failed when using containerd backend on nodes that apparmor was not installed or previously removed. This PR ensure apparmor is installed by adding it into required_pkgs var.

(cherry picked from commit af04906)

Co-authored-by: rtsp <git@rtsp.us>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@mirwan mirwan Awaiting requested review from mirwan

@woopstar woopstar Awaiting requested review from woopstar

Assignees

@oomichi oomichi

@woopstar woopstar

@floryut floryut

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. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@sathieu @k8s-ci-robot @oomichi @floryut @woopstar @rtsp