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

kernel: Update to latest versions for series 5.10, 5.15, 6.1 #3797

Merged
merged 3 commits into from
Feb 22, 2024

Conversation

foersleo
Copy link
Contributor

@foersleo foersleo commented Feb 22, 2024

Description of changes:

Update kernels to latest AL kernels available in the repositories.

Testing done:

Validate basic functionality through sonobuoy quick test:

> kubectl get nodes -o wide
NAME                                              STATUS   ROLES    AGE     VERSION                INTERNAL-IP      EXTERNAL-IP      OS-IMAGE                                KERNEL-VERSION   CONTAINER-RUNTIME
ip-192-168-1-145.eu-central-1.compute.internal    Ready    <none>   53s     v1.28.4-eks-d91a302    192.168.1.145    3.126.153.143    Bottlerocket OS 1.19.2 (aws-k8s-1.28)   6.1.77           containerd://1.6.28+bottlerocket
ip-192-168-81-26.eu-central-1.compute.internal    Ready    <none>   9m2s    v1.23.17-eks-ea94ec3   192.168.81.26    18.193.150.189   Bottlerocket OS 1.19.2 (aws-k8s-1.23)   5.10.209         containerd://1.6.28+bottlerocket
ip-192-168-94-152.eu-central-1.compute.internal   Ready    <none>   5m14s   v1.26.11-eks-b93ee12   192.168.94.152   35.158.101.171   Bottlerocket OS 1.19.2 (aws-k8s-1.26)   5.15.148         containerd://1.6.28+bottlerocket

> sonobuoy run --mode=quick --wait
[...]
11:57:06             e2e                                            global   complete            Passed:  1, Failed:  0, Remaining:  0
11:57:06    systemd-logs    ip-192-168-1-145.eu-central-1.compute.internal   complete                                                 
11:57:06    systemd-logs    ip-192-168-81-26.eu-central-1.compute.internal   complete                                                 
11:57:06    systemd-logs   ip-192-168-94-152.eu-central-1.compute.internal   complete                                                 
11:57:06 Sonobuoy plugins have completed. Preparing results for download.
11:57:26             e2e                                            global   complete   passed   Passed:  1, Failed:  0, Remaining:  0
11:57:26    systemd-logs    ip-192-168-1-145.eu-central-1.compute.internal   complete   passed                                        
11:57:26    systemd-logs    ip-192-168-81-26.eu-central-1.compute.internal   complete   passed                                        
11:57:26    systemd-logs   ip-192-168-94-152.eu-central-1.compute.internal   complete   passed                                        
11:57:26 Sonobuoy has completed. Use `sonobuoy retrieve` to get results.

Changes to the configs as reported by tools/diff-kernel-config:

config-aarch64-aws-k8s-1.23-diff:	  0 removed,   0 added,   0 changed
config-aarch64-aws-k8s-1.26-diff:	  0 removed,   0 added,   0 changed
config-aarch64-aws-k8s-1.28-diff:	  1 removed,   1 added,   0 changed
config-x86_64-aws-k8s-1.23-diff:	  0 removed,   0 added,   0 changed
config-x86_64-aws-k8s-1.26-diff:	  0 removed,   0 added,   0 changed
config-x86_64-aws-k8s-1.28-diff:	  1 removed,   0 added,   0 changed
config-x86_64-metal-k8s-1.26-diff:	  0 removed,   0 added,   0 changed
config-x86_64-metal-k8s-1.28-diff:	  1 removed,   0 added,   0 changed
config-x86_64-vmware-k8s-1.26-diff:	  0 removed,   0 added,   0 changed
config-x86_64-vmware-k8s-1.28-diff:	  1 removed,   0 added,   0 changed

The full diff-report can be found on Gist.

Changes are only on 6.1 kernels:

  • MFD_TI_AM335X_TSCADC was removed from visibility upstream by fixing up its dependencies (Reference: 6e8c0eda6cca)
  • ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD - New option introduced to enable a workaround for multiple errata, no fucntional change (Reference: 2b1dc0666e7f)

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.

Rebase to Amazon Linux upstream version 5.10.209-198.858.amzn2.

Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version 5.15.148-97.161.amzn2.

Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version 6.1.77-99.164.amzn2023.

Signed-off-by: Leonard Foerster <[email protected]>
@foersleo foersleo marked this pull request as ready for review February 22, 2024 13:00
Copy link
Member

@markusboehme markusboehme left a comment

Choose a reason for hiding this comment

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

🌽 😋

@foersleo foersleo merged commit b155ec4 into bottlerocket-os:develop Feb 22, 2024
50 checks passed
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.

4 participants