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-6.1: update to 6.1.87 #3930

Merged
merged 1 commit into from
May 3, 2024

Conversation

larvacea
Copy link
Member

Description

Rebase to Amazon Linux upstream version 6.1.87-99.174.amzn2023.

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-74-137.us-west-2.compute.internal   Ready    <none>   104s   v1.28.7-eks-c5c5da4   192.168.74.137   44.242.171.195   Bottlerocket OS 1.20.0 (aws-k8s-1.28)   6.1.87           containerd://1.6.31+bottlerocket

> sonobuoy run --mode=quick --wait
[...]

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

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

The full diff-report can be found on Gist.

The one added configuration enables a mitigation on the x86_64 platform.

Patches

There are four new patches; they are all compatible with our environment.

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 6.1.87-99.174.amzn2023.

Signed-off-by: Martin Harriman <larvacea@mac.com>
@larvacea larvacea merged commit f272abe into bottlerocket-os:develop May 3, 2024
33 checks passed
@larvacea larvacea deleted the kernel61_2024-04-30 branch May 3, 2024 17:35
@ginglis13 ginglis13 mentioned this pull request May 3, 2024
14 tasks
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.

None yet

3 participants