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 #3611

Merged
merged 4 commits into from
Nov 27, 2023

Conversation

foersleo
Copy link
Contributor

@foersleo foersleo commented Nov 23, 2023

Description of changes:

Update kernels to latest AL kernels avaulable 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-5-12.eu-central-1.compute.internal     Ready    <none>   9m12s   v1.26.10-eks-3edb55d   192.168.5.12     18.184.210.167   Bottlerocket OS 1.16.1 (aws-k8s-1.26)   5.15.137         containerd://1.6.24+bottlerocket
ip-192-168-61-195.eu-central-1.compute.internal   Ready    <none>   51s     v1.28.3-eks-e7a04cd    192.168.61.195   18.185.102.220   Bottlerocket OS 1.16.1 (aws-k8s-1.28)   6.1.61           containerd://1.6.24+bottlerocket
ip-192-168-78-132.eu-central-1.compute.internal   Ready    <none>   5m27s   v1.23.17-eks-bbbebb8   192.168.78.132   3.73.65.3        Bottlerocket OS 1.16.1 (aws-k8s-1.23)   5.10.199         containerd://1.6.24+bottlerocket

> sonobuoy run --mode=quick --wait
[...]
14:37:30    systemd-logs     ip-192-168-5-12.eu-central-1.compute.internal   complete                                                 
14:37:30    systemd-logs   ip-192-168-61-195.eu-central-1.compute.internal   complete                                                 
14:37:30    systemd-logs   ip-192-168-78-132.eu-central-1.compute.internal   complete                                                 
14:37:50             e2e                                            global   complete   passed   Passed:  1, Failed:  0, Remaining:  0
14:37:50    systemd-logs     ip-192-168-5-12.eu-central-1.compute.internal   complete   passed                                        
14:37:50    systemd-logs   ip-192-168-61-195.eu-central-1.compute.internal   complete   passed                                        
14:37:50    systemd-logs   ip-192-168-78-132.eu-central-1.compute.internal   complete   passed                                        
14:37:50 Sonobuoy has completed. Use `sonobuoy retrieve` to get results.

Changes to the configs as reported by :

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:	  0 removed,   0 added,   0 changed
config-x86_64-aws-k8s-1.23-diff:	  0 removed,   0 added,   1 changed
config-x86_64-aws-k8s-1.26-diff:	  0 removed,   0 added,   0 changed
config-x86_64-aws-k8s-1.28-diff:	  0 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:	  0 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:       0 removed,   0 added,   1 changed

The full diff-report can be found on Gist.

The one change on the 5.10 kernels is setting EFI_VARS_PSTORE_DEFAULT_DISABLE which changes the default to not using efivars as the storage backend for pstore. This was done by AL to consolidate all kernels towards a common setting.

The other change for vmware on 6.1 kernels is removing the MOUSE_PS2_VMMOUSE driver that was erroneously added in #3572 .

Terms of contribuation"

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apacke License, version 2.0, and the MIT license.

Rebase to Amazon Linux upstream version 5.10.199-190.747.amzn2.

Signed-off-by: Leonard Foerster <foersleo@amazon.com>
Rebase to Amazon Linux upstream version 5.15.137-91.144.amzn2.

Signed-off-by: Leonard Foerster <foersleo@amazon.com>
Rebase to Amazon Linux upstream version 6.1.61-85.141.amzn2023.

Signed-off-by: Leonard Foerster <foersleo@amazon.com>
With the update to 6.1.59 we picked up some additional mouse PS2 drivers
from our upstream Amazon Linux. We do not need these settings on
Bottlerocket, so remove the extra driver.

Signed-off-by: Leonard Foerster <foersleo@amazon.com>
@foersleo foersleo marked this pull request as ready for review November 23, 2023 15:11
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Looks good to me. Probably just need to rerun failed tests due to Docker rate limiting:

#4 ERROR: failed to authorize: failed to fetch oauth token: unexpected status from POST request to https://auth.docker.io/token: 429 Too Many Requests

@foersleo foersleo merged commit b375585 into bottlerocket-os:develop Nov 27, 2023
46 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.

None yet

3 participants