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 5.10.196, 5.15.133 and 6.1.55 #3509

Merged
merged 3 commits into from
Oct 19, 2023

Conversation

foersleo
Copy link
Contributor

@foersleo foersleo commented Oct 5, 2023

Issue number: n/a

Description of changes:

Update kernels to latest AL kernels available in the repositories.

Testing done:

Sonobuoy quick test results show basic functionality:

> kubectl get nodes -o wide
NAME                                              STATUS   ROLES    AGE     VERSION                INTERNAL-IP      EXTERNAL-IP    OS-IMAGE                                KERNEL-VERSION   CONTAINER-RUNTIME
ip-192-168-0-136.eu-central-1.compute.internal    Ready    <none>   118s    v1.26.7-eks-7ea2e3a    192.168.0.136    3.68.197.237   Bottlerocket OS 1.16.0 (aws-k8s-1.26)   5.15.133         containerd://1.6.23+bottlerocket
ip-192-168-48-50.eu-central-1.compute.internal    Ready    <none>   63s     v1.28.1-eks-f0272c7    192.168.48.50    3.79.206.226   Bottlerocket OS 1.16.0 (aws-k8s-1.28)   6.1.55           containerd://1.6.23+bottlerocket
ip-192-168-58-103.eu-central-1.compute.internal   Ready    <none>   2m31s   v1.23.17-eks-bbbebb8   192.168.58.103   3.79.154.135   Bottlerocket OS 1.16.0 (aws-k8s-1.23)   5.10.196         containerd://1.6.23+bottlerocket
> sonobuoy run --mode=quick --wait
[...]
16:07:30             e2e                                            global   complete   passed   Passed:  1, Failed:  0, Remaining:  0
16:07:30    systemd-logs    ip-192-168-0-136.eu-central-1.compute.internal   complete   passed                                        
16:07:30    systemd-logs    ip-192-168-48-50.eu-central-1.compute.internal   complete   passed                                        
16:07:30    systemd-logs   ip-192-168-58-103.eu-central-1.compute.internal   complete   passed                                        
16:07:30 Sonobuoy has completed. Use `sonobuoy retrieve` to get results.

Config diff reports some minor changes:

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

The full diff-report can be found on Gist

Summary of the changes:

  • Upstream retirement of net sched rsvp clasifier (NET_CLS_RSVP and NET_CLS_RSVP6) through 5.15.133 and v6.1.55. (The corresponding change for the 5.10 series landed only in 5.10.197 and will thus be part of the next update once available through AL).
  • Inclusion of DM_LOG_WRITES as a module. This module is mostly for testing and debugging and was enabled by AL per customer request. I am not quite sure if we should remove it. It probably will not find any users on Bottlerocket and removing it would help keep the images small, but increase the delta in our kernel configs.
  • Setting EFI_VARS_PSTORE_DEFAULT_DISABLE on 5.15 to align AL kernels to a uniform bahvior - no concerns here.

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.196-185.743.amzn2.

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

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

Signed-off-by: Leonard Foerster <[email protected]>
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.

I'd be in slight favor of leaving out dm-log-writes for now, but I see your point about config divergence.

@foersleo foersleo merged commit abf1736 into bottlerocket-os:develop Oct 19, 2023
48 checks passed
@foersleo foersleo deleted the kernel_updates-2023-10-05 branch October 19, 2023 08:07
@stmcginnis stmcginnis mentioned this pull request Oct 23, 2023
12 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