Skip to content

Support AppArmor beta version format for Ubuntu 20.10#4633

Merged
estesp merged 1 commit intocontainerd:masterfrom
eexe1:patch-1
Oct 15, 2020
Merged

Support AppArmor beta version format for Ubuntu 20.10#4633
estesp merged 1 commit intocontainerd:masterfrom
eexe1:patch-1

Conversation

@eexe1
Copy link
Copy Markdown
Contributor

@eexe1 eexe1 commented Oct 15, 2020 •
edited
Loading

The fix is ported from moby/moby#41518 (comment)

Ubuntu 20.10 uses AppArmor 3.0.0-beta1 version.
This causes container not able to start due to invalid syntax in parsing AppArmor version.

Signed-off-by: Evan Tsai [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Oct 15, 2020

Hi @eexe1. Thanks for your PR.

I'm waiting for a containerd 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.

Details

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.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 15, 2020

Build succeeded.

@cpuguy83
Copy link
Copy Markdown
Member

cpuguy83 commented Oct 15, 2020

Thank you! Can you also bring over the test?

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 15, 2020

Build succeeded.

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Oct 15, 2020

Thanks, please gofmt, then LGTM

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Oct 15, 2020

Also please sign off your commit with git commit -s and squash commits

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Oct 15, 2020

/Users/runner/work/containerd/containerd/src/github.com/containerd/containerd/contrib/apparmor/apparmor_test.go:80:19: undeclared name: parseVersion

AkihiroSuda
AkihiroSuda reviewed Oct 15, 2020
View reviewed changes
Comment thread contrib/apparmor/apparmor_test.go Outdated
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 15, 2020

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 15, 2020

Build succeeded.

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Oct 15, 2020

/ok-to-test

estesp
estesp approved these changes Oct 15, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit febf14d into containerd:master Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@eexe1 @k8s-ci-robot @cpuguy83 @AkihiroSuda @estesp