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.90 #3972

Merged
merged 1 commit into from
May 23, 2024

Conversation

larvacea
Copy link
Member

Rebase to Amazon Linux upstream version 6.1.90-99.173.amzn2023.

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-82-182.us-east-2.compute.internal   Ready    <none>   3m22s   v1.28.7-eks-c5c5da4   192.168.82.182   3.137.170.173   Bottlerocket OS 1.21.0 (aws-k8s-1.28)   6.1.90           containerd://1.6.31+bottlerocket

> sonobuoy run --mode=quick --wait
[...]
18:39:18             e2e                                         global   complete            Passed:  1, Failed:  0, Remaining:  0
18:39:18    systemd-logs   ip-192-168-82-182.us-east-2.compute.internal   complete                                                 
18:39:18 Sonobuoy plugins have completed. Preparing results for download.
18:39:38             e2e                                         global   complete   passed   Passed:  1, Failed:  0, Remaining:  0
18:39:38    systemd-logs   ip-192-168-82-182.us-east-2.compute.internal   complete   passed                                        
18:39:38 Sonobuoy has completed. Use `sonobuoy retrieve` to get results.

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

==> configs_k61-2024-05-17/config-aarch64-aws-k8s-1.28-diff <==
+CPU_MITIGATIONS y

==> configs_k61-2024-05-17/config-x86_64-aws-k8s-1.28-diff <==
-SPECULATION_MITIGATIONS y
+ARCH_CONFIGURES_CPU_MITIGATIONS y
+CPU_MITIGATIONS y

==> configs_k61-2024-05-17/config-x86_64-metal-k8s-1.28-diff <==
-SPECULATION_MITIGATIONS y
+ARCH_CONFIGURES_CPU_MITIGATIONS y
+CPU_MITIGATIONS y

==> configs_k61-2024-05-17/config-x86_64-vmware-k8s-1.28-diff <==
-SPECULATION_MITIGATIONS y
+ARCH_CONFIGURES_CPU_MITIGATIONS y
+CPU_MITIGATIONS y

The full diff-report can be found on Gist.

Upstream patch changes dropped one mitigation patch (see the config changes above; the patch was no longer needed) and changed one patch (change function definitions to __head).

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.90-99.173.amzn2023.

Signed-off-by: Martin Harriman <larvacea@mac.com>
@larvacea larvacea merged commit 74114b4 into bottlerocket-os:develop May 23, 2024
33 checks passed
larvacea added a commit to larvacea/bottlerocket that referenced this pull request May 28, 2024
@yeazelm yeazelm mentioned this pull request Jun 3, 2024
5 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