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

Bump containerd to latest upstream #40

Merged
merged 4 commits into from
Jul 23, 2024
Merged

Bump containerd to latest upstream #40

merged 4 commits into from
Jul 23, 2024

Conversation

vigh-m
Copy link
Contributor

@vigh-m vigh-m commented Jul 19, 2024 •
edited
Loading

Description of changes:
Updates containerd and runc to latest upstream. This will resolve CVE-2023-47108

containerd: update to v1.7.20
runc: update to v1.1.13

Testing done:

  • aws-k8s-129 variants tests on both aarch64 and x86_64 architectures.
 NAME                                 TYPE         STATE           PASSED     FAILED     SKIPPED   BUILD ID           LAST UPDATE
 aarch64-aws-k8s-129-conformance      Test         passed             392          0        7020   edc92b35-dirty     2024-07-18T23:38:25Z
 aarch64-aws-k8s-129-quick            Test         passed               5          0        7407   edc92b35-dirty     2024-07-18T21:48:15Z
 x86-64-aws-k8s-129-conformance       Test         passed             392          0        7020   edc92b35-dirty     2024-07-18T23:42:31Z
 x86-64-aws-k8s-129-quick             Test         passed               5          0        7407   edc92b35-dirty     2024-07-18T21:50:52Z
 aarch64-aws-k8s-129                  Resource     completed                                       edc92b35-dirty     2024-07-18T21:46:10Z
 x86-64-aws-k8s-129                   Resource     completed                                       edc92b35-dirty     2024-07-18T21:48:10Z
  • Tested host-ctr changes by validating that the admin and control containers are up and running
    • Also tested host-ctr binary by pulling, running, and cleaning up images.

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.

@vigh-m
Copy link
Contributor Author

vigh-m commented Jul 22, 2024

Updated host-ctr containerd dependency and added BRSA advisory info to advisory/staging

@vigh-m vigh-m force-pushed the 3p-updates branch 2 times, most recently from 0e26e7f to 226c462 Compare July 22, 2024 21:05
@vigh-m
Copy link
Contributor Author

vigh-m commented Jul 22, 2024

Update advisory language and commit message

larvacea
larvacea approved these changes Jul 23, 2024
View reviewed changes
Copy link
Member

@larvacea larvacea left a comment

Choose a reason for hiding this comment

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

I downloaded the tar files and verified the corresponding sha512sum values.

@vigh-m vigh-m merged commit c7832b4 into bottlerocket-os:develop Jul 23, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@larvacea larvacea larvacea approved these changes

@koooosh koooosh koooosh approved these changes

@ginglis13 ginglis13 ginglis13 approved these changes

@vyaghras vyaghras Awaiting requested review from vyaghras

@arnaldo2792 arnaldo2792 Awaiting requested review from arnaldo2792

@yeazelm yeazelm Awaiting requested review from yeazelm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vigh-m @larvacea @koooosh @ginglis13