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

Third-party software package version bumps #895

Merged
merged 6 commits into from
Apr 9, 2020

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Apr 8, 2020

Issue number:
Fixes #893

Description of changes:
Minor version bumps across many of the third-party packages.
This does not update kubernetes, kernel, or systemd packaging.

  • strace 5.5 -> 5.6
  • libxcrypt 4.4.15 -> 4.4.16
  • libnetfilter-conntrack 1.0.7 -> 1.0.8
  • libnftnl 1.1.5 -> 1.1.6
  • conntrack-tools 1.4.5 -> 1.4.6
  • libseccomp 2.4.2 -> 2.4.3

The upstream source files have been all uploaded to the lookaside cache.

Notes:

  • libseccomp patches have been upstreamed
  • contrack-tools patch 0001 has been updated so it cleanly applies. The new version (v1.4.6) added dependency on libtirpc.

Testing done:
Built bottlerocket aws-k8s image successfully, launched instance. The node joins my cluster fine, can run pods fine.

Built bottlerocket dev variant image successfully. I can reach the instance via SSM and enable the admin container. Can run containers using docker fine.

[ec2-user@ip-192-168-4-184 ~]$ sudo sheltie
bash-5.0# docker run -it busybox
/ # date
Wed Apr  8 00:48:43 UTC 2020
/ #

The ARM build builds successfully.

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.

This commit bumps strace from version 5.5 to 5.6 which includes numerous
improvements and bug fixes
This bumps the version of libxcrypt from version 4.4.15 to 4.4.16. No
significant changes.
This bumps the version of libnetfilter_conntrack from version 1.0.7 to
1.0.8
This bumps the version of libnftnl from version 1.1.5 to 1.1.6.
This bumps the version of conntrack-tools from version 1.4.5 to 1.4.6.
This also updates patch 0001 so it cleanly applies.
This bumps the version of libseccomp from 2.4.2 to 2.4.3.
Patches 0001 and 0002 are dropped since they have been upstreamed in
2.4.3
Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

LGTM, but you mentioned a failure from early-boot-config in the dev variant - have you sorted that out? Does it happen without these changes? Does it happen in the aws-k8s-1.15 variant?

@bcressey
Copy link
Contributor

bcressey commented Apr 8, 2020

LGTM as well.

Can you verify that the arm64 build works, via cargo make -e BUILDSYS_ARCH=aarch64 ? We've seen a fair number of regressions here and our CI doesn't catch that at the moment.

@etungsten
Copy link
Contributor Author

etungsten commented Apr 8, 2020

LGTM as well.

Can you verify that the arm64 build works, via cargo make -e BUILDSYS_ARCH=aarch64 ? We've seen a fair number of regressions here and our CI doesn't catch that at the moment.

The ARM build still works:
$ cargo make -e BUILDSYS_ARCH=aarch64
[cargo-make] INFO - cargo make 0.30.0
[cargo-make] INFO - Build File: Makefile.toml
[cargo-make] INFO - Task: default
....
   Compiling dbus-broker v0.1.0 (/home/ANT.AMAZON.COM/etung/thar/bottlerocket/packages/dbus-broker)
    Finished dev [optimized] target(s) in 61m 43s
[cargo-make] INFO - Running Task: build-variant
   Compiling aws-k8s-1_15 v0.1.0 (/home/ANT.AMAZON.COM/etung/thar/bottlerocket/variants/aws-k8s-1.15)
    Finished dev [unoptimized + debuginfo] target(s) in 1m 18s
[cargo-make] INFO - Running Task: link-variant
[cargo-make] INFO - Running Task: default
[cargo-make] INFO - Build Done in 4020 seconds.

I was also able to launch an arm64 bottlerocket instance with the image and it comes up fine.

Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

LGTM, but you mentioned a failure from early-boot-config in the dev variant - have you sorted that out? Does it happen without these changes? Does it happen in the aws-k8s-1.15 variant?

We figured out that it was caused by user data for the k8s variant being sent to the dev variant. I'm looking into improving error messages, but it's not related to this change.

@etungsten etungsten merged commit 892c0d2 into bottlerocket-os:develop Apr 9, 2020
@etungsten etungsten deleted the package-updates branch April 9, 2020 05:34
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.

Update dependency versions
4 participants