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

Containerd backports for shim logs and signal forwarder issues #1216

Merged
merged 2 commits into from
Nov 16, 2020

Conversation

zmrow
Copy link
Contributor

@zmrow zmrow commented Nov 16, 2020

Issue number:
N/A

Description of changes:
Backport a few upstream containerd fixes for for shim logs and signal forwarder issues

Testing done:

  • Built and ran a Bottlerocket AMI - host containers started and run fine
  • Run sonobuoy tests for this single AMI/variant (aws-k8s-1.17 / x86_64)
Plugin: e2e
Status: passed
Total: 4412
Passed: 215
Failed: 0
Skipped: 4197

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@zmrow
Copy link
Contributor Author

zmrow commented Nov 16, 2020

^ Fixes the comments in containerd.spec - we can remove the patches when we move to 1.4.1.

Copy link
Contributor

@webern webern left a comment

Choose a reason for hiding this comment

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

LGTM (saw a typo)

packages/containerd/containerd.spec Outdated Show resolved Hide resolved
packages/containerd/5001-Always-consome-shim-logs.patch Outdated Show resolved Hide resolved
@zmrow
Copy link
Contributor Author

zmrow commented Nov 16, 2020

^ Fix typo

@zmrow zmrow marked this pull request as ready for review November 16, 2020 18:58
Backport the patch from
containerd/containerd#4543 which fixes SIGURG
issues with go 1.14+.
Backort the patch from
containerd/containerd@42f3871
which ensures that fifos are consumed and do not fill up.
@zmrow
Copy link
Contributor Author

zmrow commented Nov 16, 2020

^ Split the signal forwarder patch into 2 patches as per @bcressey

@zmrow zmrow merged commit 178ed6c into bottlerocket-os:develop Nov 16, 2020
@zmrow zmrow deleted the containerd-backport branch November 16, 2020 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants