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

Fix #6118: Use OS packaging default for apparmor_profile in crio.conf #6125

Merged
merged 1 commit into from
May 15, 2020
Merged

Fix #6118: Use OS packaging default for apparmor_profile in crio.conf #6125

merged 1 commit into from
May 15, 2020

Conversation

jeanfabrice
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:
While vanilla cri-o makes cri-o is using a cri-default apparmor profile (see https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md), Opensuze Kubic OS packages (the ones used by Kubespray to install cri-o, at least for CentOS, Debian and Ubuntu) install and use a default apparmor profile named 'cri-default-'.

Having the crio.conf file statically configured with apparmor_profile="cri-default" makes cri-o crashes at start since this profile is not installed.

Best option is to not define apparmor_profile in crio.conf and lets cri-o defaults to 'cri-default-<crio-version>'

Which issue(s) this PR fixes:

Fixes #6118

Special notes for your reviewer:`
No clue on how cri-o default apparmor profile is handled on others distributions

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 11, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @jeanfabrice!

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 @jeanfabrice. 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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 11, 2020
@k8s-ci-robot k8s-ci-robot requested review from bozzo and EppO May 11, 2020 12:37
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 11, 2020
@floryut
Copy link
Member

floryut commented May 11, 2020

@jeanfabrice Thank you for the PR and contribution!
Could you amend your commit message, as the bot said, # and @ are not allowed, the PR number will be added to your commit message and with that the issue link to the pr will be accessible, so need to add it :)

/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 May 11, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label May 11, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented May 13, 2020

/approve

Does this mean we will be able to re-introduce some of the crio CI jobs?

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jeanfabrice, Miouge1

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 May 13, 2020
@EppO
Copy link
Contributor

EppO commented May 15, 2020

/lgtm

one of the CI job didn't report its completion status to GitHub but it passed. I'll try to restart the job. It's not a CRI-O job anyway...

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 15, 2020
@k8s-ci-robot k8s-ci-robot merged commit 3997aa9 into kubernetes-sigs:master May 15, 2020
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request May 29, 2020
k8s-ci-robot pushed a commit that referenced this pull request Jun 4, 2020
* Enable crio 1.18 (#6197)

* fix CRI-O repos for centos distributions (#6224)

* fix CRI-O repos for centos distributions

* fix CRI-O repos for centos distributions
- revert workarounds

* fix CRI-O repos for centos distributions
- use https for centos repos

* avoid 302 redirects for centos repos

* Use OS packaging default value for apparmor_profile in crio.conf (#6125)

Co-authored-by: jeanfabrice <github@bobo-rousselin.com>
@floryut floryut mentioned this pull request Aug 14, 2020
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/bug Categorizes issue or PR as related to a bug. 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.

crio doesn't start because of wrong apparmor profile
5 participants