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

Updating 3rd Party packages #36

Merged
merged 12 commits into from
Jul 18, 2024
Merged

Updating 3rd Party packages #36

merged 12 commits into from
Jul 18, 2024

Conversation

vigh-m
Copy link
Contributor

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

Description of changes:

Updating 3rd party dependencies for the bottlerocket-core-kit

libncurses: update to 6.5 rev 20240713
util-linux: update to 2.40 rev 2
ethtool: update to v6.9
docker-cli: update to v25.0.5
docker-engine: update to v25.0.5
cni-plugins: update to v1.5.1
soci-snapshotter: update to v0.6.1
strace: update to v6.9
e2fsprogs: update to v1.47.1
findutils: update to v4.10.0
xfsprogs: update to v6.8.0
aws-iam-authenticator: update to v0.6.21

Testing done:

  • Manual testing by launching nodes on EKS
  • aws-k8s-1.29 testing
    Quick
 NAME                                 TYPE 	  STATE         PASSED    FAILED    SKIPPED   BUILD ID          LAST UPDATE
 x86-64-aws-k8s-129-quick             Test 	  passed             5         0       7407   edc92b35-dirty    2024-07-16T03:47:20Z
 x86-64-aws-k8s-129                   Resource    completed                                   edc92b35-dirty    2024-07-16T03:45:29Z
 x86-64-aws-k8s-129-instances-vmmg    Resource    running                                     edc92b35-dirty    2024-07-16T03:47:26Z

Conformance

x86-64-aws-k8s-129-conformance        Test            passed                  392            0          7020   edc92b35-dirty       2024-07-16T05:36:14Z
  • aws-ecs-2 testing
NAME                              TYPE     STATE     PASS   FAIL   SKIPP   BUILD ID	   LAST UPDATE
x86-64-aws-ecs-2-quick            Test     passed 	 1	0	0   edc92b35-dir   2024-07-16T04:35:4

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 16, 2024

Update to fix typos

@vigh-m vigh-m mentioned this pull request Jul 16, 2024
Merged
yeazelm
yeazelm reviewed Jul 16, 2024
View reviewed changes
packages/aws-iam-authenticator/Cargo.toml Show resolved Hide resolved
packages/containerd/containerd.spec Outdated
@@ -2,9 +2,9 @@
%global gorepo containerd
%global goimport %{goproject}/%{gorepo}

%global gover 1.7.17
%global gover 1.7.19
Copy link
Contributor

Choose a reason for hiding this comment

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

One note from the release notes that is nice is library updates so that 2.0 and 1.7 can be imported together! We should also update host-ctr with this new version once this is merged.

packages/libncurses/libncurses.spec Outdated Show resolved Hide resolved
@vigh-m
Copy link
Contributor Author

vigh-m commented Jul 16, 2024

Updated util-linux and ncurses to the latest upstream. Also updated the commit message for iproute2 to point to the correct upstream commit

@bcressey bcressey changed the title Updating 3rd Party packaged Updating 3rd Party packages Jul 17, 2024
bcressey
bcressey reviewed Jul 17, 2024
View reviewed changes
packages/aws-iam-authenticator/aws-iam-authenticator.spec Outdated Show resolved Hide resolved
packages/iproute/iproute.spec Outdated
@@ -46,7 +45,7 @@ export PKG_CONFIG_PATH='%{_cross_pkgconfigdir}' \\\
%make_install

install -d %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}
mv %{buildroot}%{_cross_sysconfdir}/iproute2 %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}
mv %{buildroot}%{_datarootdir}/iproute2 %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}
Copy link
Contributor

Choose a reason for hiding this comment

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

If ip will look for its files in /usr/share instead of /etc, that would be great - saves time copying stuff to tmpfiles. There is probably an export SOMETHINGDIR='%{_cross_datadir}' that would get make install to put stuff in the right place.

(Does it still look in /etc? If not then this change is not correct.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah. This is the change I was using to make this change. They're explicit about using /usr/share instead of /etc from my reading

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Running into errors when trying the suggested changes. I'm removing this update from this PR to take a closer look

packages/libncurses/ncurses-kbs.patch Outdated Show resolved Hide resolved
@vigh-m
Copy link
Contributor Author

vigh-m commented Jul 18, 2024

Force push removing the following updates

  • iproute
  • containerd
  • runc
  • ecs-agent

@vigh-m
util-linux: update to 2.40.2
582ffaa
@vigh-m
libncurses: update to 6.5 rev 20240713
20a7fb3 
Removed a patch which was brought in from Fedora upstream since they
have dropped it as well
@vigh-m
Copy link
Contributor Author

vigh-m commented Jul 18, 2024

Push to amend the commit message for util-linux

arnaldo2792
arnaldo2792 approved these changes Jul 18, 2024
View reviewed changes
packages/soci-snapshotter/Cargo.toml
url = "https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.5.0.tar.gz"
sha512 = "9980688b71c149ea0f36c52906ba0cc862ca65b9ee0e4b813fef0df83716e313137886986cc78b694e35516fb21095b0cd0436caf485d4b63bd01b150769b6f4"
bundle-root-path = "soci-snapshotter-0.5.0/cmd"
url = "https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.6.1.tar.gz"
Copy link
Contributor

Choose a reason for hiding this comment

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

Not related to this PR, but I just realized that this URL doesn't look like all the other URLs we have for Github projects.

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

@arnaldo2792 arnaldo2792 arnaldo2792 approved these changes

@yeazelm yeazelm yeazelm approved these changes

@vyaghras vyaghras vyaghras approved these changes

@ginglis13 ginglis13 Awaiting requested review from ginglis13

@bcressey bcressey Awaiting requested review from bcressey

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

Successfully merging this pull request may close these issues.
6 participants
@vigh-m @bcressey @arnaldo2792 @ginglis13 @yeazelm @vyaghras