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

Kernels 2024 05 01 #3934

Merged
merged 2 commits into from
May 3, 2024
Merged

Conversation

larvacea
Copy link
Member

@larvacea larvacea commented May 1, 2024

Description of changes:

Update kernels 5.10 and 5.15 to the latest upstream kernels.

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-27-120.us-west-2.compute.internal   Ready    <none>   101s    v1.26.14-eks-b063426   192.168.27.120   54.184.14.68    Bottlerocket OS 1.20.0 (aws-k8s-1.26)   5.15.156         containerd://1.6.31+bottlerocket
ip-192-168-36-55.us-west-2.compute.internal    Ready    <none>   5m13s   v1.23.17-eks-ea94ec3   192.168.36.55    35.85.153.152   Bottlerocket OS 1.20.0 (aws-k8s-1.23)   5.10.215         containerd://1.6.31+bottlerocket

> sonobuoy run --mode=quick --wait
[...]
21:05:12             e2e                                         global   complete            Passed:  1, Failed:  0, Remaining:  0
21:05:12    systemd-logs   ip-192-168-27-120.us-west-2.compute.internal   complete                                                 
21:05:12    systemd-logs    ip-192-168-36-55.us-west-2.compute.internal   complete                                                 
21:05:12 Sonobuoy plugins have completed. Preparing results for download.
21:05:32             e2e                                         global   complete   passed   Passed:  1, Failed:  0, Remaining:  0
21:05:32    systemd-logs   ip-192-168-27-120.us-west-2.compute.internal   complete   passed                                        
21:05:32    systemd-logs    ip-192-168-36-55.us-west-2.compute.internal   complete   passed                                        
21:05:32 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:	  2 removed,   2 added,   0 changed
config-x86_64-aws-k8s-1.23-diff:	  0 removed,   1 added,   0 changed
config-x86_64-aws-k8s-1.26-diff:	  2 removed,   6 added,   0 changed
config-x86_64-metal-k8s-1.26-diff:	  0 removed,   0 added,   0 changed
config-x86_64-vmware-k8s-1.26-diff:	  0 removed,   0 added,   0 changed

The full diff-report can be found on Gist.

I have reviewed the configuration changes and I see nothing there that could be a problem for bottlerocket. The same is true of the patch changes: all simple, and all benign.

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.215-203.850.amzn2.

Signed-off-by: Martin Harriman <[email protected]>
Rebase to Amazon Linux upstream version 5.15.156-102.160.amzn2.

Signed-off-by: Martin Harriman <[email protected]>
@larvacea larvacea self-assigned this May 1, 2024
@larvacea larvacea merged commit d3423f4 into bottlerocket-os:develop May 3, 2024
33 checks passed
@larvacea larvacea deleted the kernels-2024-05-01 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.

3 participants