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

3p packages update 1.19.3 #3832

Merged
merged 20 commits into from
Mar 20, 2024

Conversation

vyaghras
Copy link
Contributor

@vyaghras vyaghras commented Mar 19, 2024

Issue number:

Closes #

Description of changes:

packages: update amazon-ssm-agent to 3.3.131.0
packages: update cacert to 2024-03-11
packages: update conntrack-tools to 1.4.8  - Updated patch to apply on latest version
packages: update kexec-tools to 2.0.28 
add FORCE_HOST_GO - Add export FORCE_HOST_GO=1 for all kubernetes versions.
packages: update libaudit to 3.1.3 
packages: update libexpat to 2.6.2 
packages: update libglib to 2.78.4 
packages: update libselinux to 3.6 
packages: update libsemanage to 3.6 
packages: update libsepol to 3.6 
packages: update policycoreutils to 3.6 
packages: update xfsprogs from 6.4.0 to 6.6.0 -- Deleted the patch as the changes are available upstream.
packages: update containerd to 1.6.28

Updated all kubernetes versions from https://distro.eks.amazonaws.com/#release-version-dependencies
packages: update kubernetes 1.24 to release 36 
packages: update kubernetes-1.25 to release 35 
packages: update kubernetes 1.26 to 1.26.14 
packages: update kubernetes-1.27 to 1.27.11 
packages: update kubernetes-1.28 to 1.28.7 
packages: update kubernetes-1.29 to 1.29.1 

Testing done:

  • aws-k8s-1.28
  • Quick
 x86-64-aws-k8s-128-quick                          Test              passed                        5              0            7388   5da0642b         2024-03-19T20:40:47Z
 x86-64-aws-k8s-128                                Resource          completed                                                        5da0642b         2024-03-19T20:38:57Z
  • Conformance
NAME                                     TYPE               STATE                       PASSED           FAILED          SKIPPED   BUILD ID          LAST UPDATE
 x86-64-aws-k8s-128-conformance           Test               passed                         384                0             7009   5da0642b          2024-03-19T22:32:10Z
 x86-64-aws-k8s-128                       Resource           completed                                                              5da0642b          2024-03-19T20:46:37Z
  • aws-k8s-1.28-nvidia
  • Conformance
x86-64-aws-k8s-128-nvidia-conformance          Test              passed                       384               0             7009   5da0642b         2024-03-20T02:12:15Z
 x86-64-aws-k8s-128-nvidia                      Resource          completed                                                           5da0642b         2024-03-20T00:32:16Z
  • Quick
x86-64-aws-k8s-128-nvidia-quick                Test              passed                         5               0             7388   bfd44a8e         2024-03-20T03:58:11Z
  • aws-ecs-2
x86-64-aws-ecs-2-quick                       Test           passed                 1           0            0   bfd44a8e      2024-03-20T05:04:24Z
  • aws-ecs-2-nvidia

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.

@@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: I'd like to see the addition of these as their own commit and down by the rest of the exports (probably after export %{kube_cc} along with a comment explaining that we want to override the Go specification since we bring our own Go toolchain.

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed about putting them in their own commit (kubelet: set FORCE_HOST_GO=1 in environment).

But it does need to be set here, before make generated_files is invoked, or it will try again to download the Go toolchain for codegen.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh interesting, I didn't realize they used go in the codegen :| Ok, then I agree that is where it should be.

@@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/linux-audit/audit-userspace/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/linux-audit/audit-userspace/archive/v3.1.2/audit-userspace-3.1.2.tar.gz"
sha512 = "d5b05686aedd6eaaced000778580bd3e96e38c020534038d6b1ee6de96dd7687c2f3a52a2ae75be8b93c173b286a56dbc92231906c68fda79b113dfcaad6da84"
url = "https://github.com/linux-audit/audit-userspace/archive/v3.1.3/audit-userspace-3.1.3.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.

It's fine to stay on 3.x for now, but it should also be possible to move up to audit 4 - or if it's not, we should at least have tried it and have a sense of what's broken.

Copy link
Contributor Author

@vyaghras vyaghras Mar 20, 2024

Choose a reason for hiding this comment

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

Yes.

@@ -89,6 +90,7 @@ export USE_PCRE2='y' \\\
%exclude %{_cross_sbindir}/togglesebool
%exclude %{_cross_sbindir}/validatetrans


Copy link
Contributor

Choose a reason for hiding this comment

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

nit: don't need a new newline

Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

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

LGTM!

@vyaghras vyaghras merged commit 9fded83 into bottlerocket-os:develop Mar 20, 2024
50 checks passed
@vyaghras vyaghras deleted the 3p-packages-update-1.19.3 branch March 20, 2024 15:07
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.

3 participants