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 package updates #2464

Merged
merged 28 commits into from Oct 5, 2022

Conversation

arnaldo2792
Copy link
Contributor

@arnaldo2792 arnaldo2792 commented Sep 29, 2022

Issue number:

Closes #2411

Description of changes:
libnvidia-container added support for some experimental features gated behind the WITH_NVCGO flag. For the time being, we are not using those features since that will require a huge fundamental change to how we use the library.

open-vm-tools added support for a plugin to list containers running in either docker or kubernetes. For this update, I skipped the support for the plugin, but we should turn this on as a fast-follow PR.

There are a few packages that added security fixes:

  • open-vm-tools
  • libexpat
  • libdbus
  • docker-engine

The following packages were skipped:

  • bash
  • wicked
  • readline

There isn't any security fix for any of them, but we need to spend some time figuring out why they aren't happy with the provided arguments.

The following package requires more testing:

  • systemd

And lastly, the following packages will be updated in a different PR:

  • kernel-5_10
  • kernel-5_15
  • microcode
*  packages: update util-linux
*  packages: update strace
*  packages: update open-vm-tools
*  packages: update nvidia-k8s-device-plugin
*  packages: update nvidia-container-toolkit
*  packages: update libtirpc
*  packages: update libnvidia-container
*  packages: update libnl
*  packages: update libnftnl
*  packages: update liblzma
*  packages: update libglib
*  packages: update libffi
*  packages: update libexpat
*  packages: update libdbus
*  packages: update libcap
*  packages: update libaudit
*  packages: update kubernetes 1.21
*  packages: update kexec-tools
*  packages: update iproute
*  packages: update grub
*  packages: update grep
*  packages: update ecs-agent and amazon-vpc-cni-plugins
*  packages: update docker-proxy
*  packages: update docker-engine
*  packages: update docker-cli
*  packages: update containerd
*  packages: update chrony
*  packages: update acpid

Testing done:

  • cargo make test for aws-k8s-1.22
  • cargo make test for aws-k8s-1.21
  • Make sure vmware images booted as expected, and that the UI reports the usage of open-vm-tools
  • Run smoke test for aws-k8s-1.22-nvidia
  • Validate grub output in aws x86_64/aarch64
  • Validate grub output in VMware x86_64
  • Validate grub output in Metal x86_64 EFI/BIOS
  • Run a few tasks with aws-ecs-1 and aws-ecs-1-nvidia
  • Make sure chronyd runs for at least 1hr
bash-5.1# chronyd --version
chronyd (chrony) version 4.3 (+CMDMON +NTP +REFCLOCK +RTC +PRIVDROP +SCFILTER -SIGND +ASYNCDNS -NTS -SECHASH +IPV6 -DEBUG)
bash-5.1# systemctl status chronyd.service
● chronyd.service - A versatile implementation of the Network Time Protocol
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/chronyd.service; enabled; vendor preset: enabled)
     Active: active (running) since Fri 2022-09-30 20:51:02 UTC; 1h 46min ago
       Docs: https://chrony.tuxfamily.org

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.

packages/chrony/Cargo.toml Show resolved Hide resolved
packages/kexec-tools/kexec-tools.spec Show resolved Hide resolved
BuildRequires: meson
BuildRequires: %{_cross_os}glibc-devel
BuildRequires: %{_cross_os}libffi-devel
BuildRequires: %{_cross_os}libmount-devel
BuildRequires: %{_cross_os}libpcre-devel
Copy link
Contributor

Choose a reason for hiding this comment

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

This switch from PCRE1 to PCRE2 is fantastic!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since we moved to pcre2, do we need to change the License field for this package? as we as the comment above:

# pcre is BSD-3-Clause

packages/libglib/libglib.spec Show resolved Hide resolved
packages/libnftnl/Cargo.toml Outdated Show resolved Hide resolved
packages/grub/grub.spec Show resolved Hide resolved
@@ -116,8 +110,6 @@ Requires: %{_cross_os}libuuid
cp Documentation/licenses/COPYING.* .

%build
# We have patches that touch the build system, so we need to regenerate
Copy link
Contributor

@bcressey bcressey Sep 29, 2022

Choose a reason for hiding this comment

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

🎉

packages/ecs-agent/Cargo.toml Outdated Show resolved Hide resolved
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
@arnaldo2792
Copy link
Contributor Author

The last two forced pushes include:

  • Mention the new binary excluded in libglib in commit message
  • Fix sources urls and use https in:
    • acpid
    • iproute
    • libnftnl

@jpculp
Copy link
Member

jpculp commented Sep 29, 2022

I built and booted a bottlerocket-vmware-k8s-1.21 ova and VMware Tools is showing Version 12320 (12.1.0).

@arnaldo2792
Copy link
Contributor Author

Forced push includes:

  • Move back amazon-vpc-cni-plugins to the default commit used by the ECS agent

@arnaldo2792 arnaldo2792 marked this pull request as ready for review October 3, 2022 21:04
@arnaldo2792
Copy link
Contributor Author

(Forced push fixes the referenced file in Cargo.toml for libnvidia-container and nvidia-container-toolkit)

@arnaldo2792
Copy link
Contributor Author

(Forced push fixes the upstream URL for libnvidia-container)

@bcressey
Copy link
Contributor

bcressey commented Oct 4, 2022

Can you open issues for what you'd like to see happen with libnvidia-container and open-vm-tools?


%install
install -d %{buildroot}%{_cross_bindir}
install -d %{buildroot}%{_cross_tmpfilesdir}
install -d %{buildroot}%{_cross_templatedir}
install -d %{buildroot}%{_cross_datadir}/nvidia-container-toolkit
install -d %{buildroot}%{_cross_factorydir}/etc/nvidia-container-runtime
install -p -m 0755 nvidia-container-toolkit %{buildroot}%{_cross_bindir}/nvidia-container-runtime-hook
install -p -m 0755 nvidia-container-runtime-hook %{buildroot}%{_cross_bindir}/
Copy link
Contributor

Choose a reason for hiding this comment

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

extremely minor nit: I try to avoid trailing slashes for directories like this since, if done habitually, it tends to lead to double slashes (//) in path names in build output, which is harmless but annoying.

Not worth fixing here, it's mostly about asking the question of whether a slash is needed after a given macro when you're writing spec files.

@arnaldo2792
Copy link
Contributor Author

Can you open issues for what you'd like to see happen with libnvidia-container and open-vm-tools?

Sure @bcressey! I need to spend some time reading in detail how each of the features in the packages work

etungsten and others added 10 commits October 4, 2022 18:12
This also drops the 0001-sys_linux patch since that's been included in
4.3.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Fixes CVE-2022-36109

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
This regenerates the 0005 patch since it longer cleanly applies.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Fixes CVE-2020-35512. The libdbus developers don't distribute gzipped
files anymore.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Fixes CVE-2022-40674

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
@arnaldo2792
Copy link
Contributor Author

(Nothing functional changed in last forced push, I only added missing Signed-off-by markers to a few commits)

In newer versions of the library, the `gio-launch-desktop` desktop
helper binary was added. There isn't a meson option to avoid building
the helper binary, thus it is excluded in the RPM recipe.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
libnvidia-container added support to configure cgroups through a go
library, which is currently "experimental". In order to use the stable
behavior, this package has to be compiled with `WITH_NVCGO=n`.

This also updates the upstream URL to use a more specific file name
instead of only the version of the package used.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
This also updates the upstream URL to use a more specific file name
instead of only the version of the package used.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Fixes CVE-2022-31676

In ed84c0a175c0122555a6a7cc947590569d28becb, support to list docker and
kubernetes containers was added to open-vm-tools. We should consider
enabling this feature in the future.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
This also drops 1000-libmount-kernel-compat.patch, since the patch was
required for kernels < 5.8, and we no longer have the sources for the
5.4 kernel.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
@arnaldo2792
Copy link
Contributor Author

(Forced push removes note about license in libglib)

Copy link
Member

@jpculp jpculp left a comment

Choose a reason for hiding this comment

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

🚀

@arnaldo2792 arnaldo2792 merged commit 7734f24 into bottlerocket-os:develop Oct 5, 2022
@arnaldo2792 arnaldo2792 deleted the 3ppackageupdates branch October 26, 2022 18:43
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 packages for 1.10.0
4 participants