-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Update cri-o from v1.22.3 to v1.24.1 #14420
Conversation
Signed-off-by: Paul S. Schweigert <[email protected]>
Can one of the admins verify this patch? |
Hi @psschwei, thanks for the PR! There is actually an additional spot the version should be updated: minikube/deploy/kicbase/Dockerfile Line 44 in 231c72d
However, before I can run the ISO and kicbase build we need to wait for cri-o to fix there not being a s390x package: So please update the additional spot I mentioned and once the cri-o issue is resolved I'll get this PR moving, thanks! |
Signed-off-by: Paul S. Schweigert <[email protected]>
/ok-to-build-iso |
ok-to-build-image |
Hi @psschwei, we have updated your PR with the reference to newly built kicbase image. Pull the changes locally if you want to test with them or update your PR further. |
Hi @psschwei, building a new ISO failed. |
Build failed due to a hash error:
Though I double-checked, and the expected hash above is the same as from the CRI-O 1.24.1 relese note. Assuming that is the right hash to use here... |
I'll double check in a little bit |
It looks like you grabbed the hash of cri-o.amd64.v1.24.1.tar.gz, but we want the hash for Source code (tar.gz), |
Signed-off-by: Paul S. Schweigert <[email protected]>
Whoops... sorry about that. Fixed now. |
ok-to-build-iso |
Hi @psschwei, building a new ISO failed. |
It looks like cri-o is failing to build
|
I'm wondering if one of the imports is using Go 1.17 or 1.18 specific features, I think our ISO Go version might be a little bit behind, that's my bet |
Yeah, this looks like the problem (capnproto/go-capnp#229), one of the imports is using generics which were introduced in Go 1.18, but we're using Go 1.17 for the ISO. Would you mind bumping this to 1.18 and I'll re-run the ISO build, thanks! Line 47 in 0bbdeb8
|
Signed-off-by: Paul S. Schweigert <[email protected]>
Thanks for the catch! Updated |
Apologies, I forgot to mention that the hash for the Go version needs to be added as well:
Would you mind just appending
|
Signed-off-by: Paul S. Schweigert <[email protected]>
No worries, done |
Hey @psschwei, all the tests look good to me expect This is partly because cri-o 1.22 stopped outputting values in The other part is the test itself is checking for the the old way of config. If you wouldn't mind updating this test here: minikube/test/integration/docker_test.go Lines 125 to 134 in a536bcb
If you have any questions let me know, I can also make the change if don't have the time |
No worries, I'll knock it out in a bit (also the additional doc update from the other PR). Thanks for all the help getting this one in, it's greatly appreciated! |
Signed-off-by: Paul S. Schweigert <[email protected]>
kvm2 driver with docker runtime
Times for minikube start: 56.8s 59.1s 54.6s 55.7s 54.7s Times for minikube ingress: 32.0s 28.6s 29.1s 29.1s 30.0s docker driver with docker runtime
Times for minikube (PR 14420) ingress: 21.5s 22.9s 23.9s 21.9s 22.4s Times for minikube start: 26.9s 26.5s 27.1s 27.6s 27.6s docker driver with containerd runtime
Times for minikube ingress: 28.4s 26.9s 27.4s 27.4s 27.4s Times for minikube start: 23.1s 23.8s 23.5s 22.9s 23.5s |
These are the flake rates of all failed tests.
Too many tests failed - See test logs for more details. To see the flake rates of all tests by environment, click here. |
Signed-off-by: Paul S. Schweigert <[email protected]>
kvm2 driver with docker runtime
Times for minikube (PR 14420) ingress: 25.6s 29.1s 26.1s 30.1s 25.5s Times for minikube start: 56.9s 56.8s 56.0s 56.6s 55.8s docker driver with docker runtime
Times for minikube (PR 14420) start: 28.9s 28.4s 29.5s 26.6s 28.6s Times for minikube ingress: 23.9s 22.4s 21.9s 83.4s 22.9s docker driver with containerd runtime
Times for minikube start: 35.5s 23.3s 24.0s 24.6s 23.5s Times for minikube ingress: 27.4s 27.4s 27.4s 27.4s 27.4s |
Signed-off-by: Paul S. Schweigert <[email protected]>
kvm2 driver with docker runtime
Times for minikube start: 56.2s 58.2s 56.7s 56.0s 56.1s Times for minikube ingress: 30.6s 30.1s 25.5s 29.1s 29.1s docker driver with docker runtime
Times for minikube start: 28.4s 28.6s 27.1s 27.8s 28.5s Times for minikube ingress: 22.4s 22.9s 23.0s 22.9s 23.4s docker driver with containerd runtime
Times for minikube (PR 14420) start: 22.8s 23.3s 23.4s 23.1s 23.6s Times for minikube ingress: 27.4s 27.4s 27.4s 27.4s 27.4s |
I believe you may have accidentally wiped the ISO changes made by the minikube-bot when you squashed your commits Could you please re-run the following when you get the chance:
|
Signed-off-by: Paul S. Schweigert <[email protected]>
Signed-off-by: Paul S. Schweigert <[email protected]>
These are the flake rates of all failed tests.
Too many tests failed - See test logs for more details. To see the flake rates of all tests by environment, click here. |
kvm2 driver with docker runtime
Times for minikube start: 56.6s 57.8s 57.0s 56.3s 55.8s Times for minikube ingress: 30.2s 30.1s 28.5s 25.6s 25.1s docker driver with docker runtime
Times for minikube start: 27.9s 28.1s 27.9s 27.9s 28.5s Times for minikube ingress: 20.9s 23.0s 21.4s 22.4s 22.5s docker driver with containerd runtime
Times for minikube (PR 14420) ingress: 25.9s 25.9s 27.4s 27.4s 25.9s Times for minikube start: 23.1s 34.5s 23.5s 23.5s 23.2s |
kvm2 driver with docker runtime
Times for minikube start: 59.0s 56.8s 58.1s 54.9s 54.9s Times for minikube (PR 14420) ingress: 29.1s 29.1s 25.6s 25.1s 29.1s docker driver with docker runtime
Times for minikube start: 27.5s 29.7s 28.3s 28.3s 26.1s Times for minikube ingress: 23.9s 22.9s 22.4s 22.4s 22.9s docker driver with containerd runtime
Times for minikube ingress: 26.9s 27.4s 58.4s 27.4s 27.4s Times for minikube start: 22.9s 34.7s 24.2s 23.7s 23.7s |
These are the flake rates of all failed tests.
Too many tests failed - See test logs for more details. To see the flake rates of all tests by environment, click here. |
These are the flake rates of all failed tests.
Too many tests failed - See test logs for more details. To see the flake rates of all tests by environment, click here. |
Yeah, that was supposed to be in #14473. But since it's a cleanup, if you're happy with it here I can just close the other one... |
I'm fine with it here, I'll merge it now, thank you! |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: psschwei, spowelljr The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Thanks for your help shepherding this through! |
Signed-off-by: Paul S. Schweigert [email protected]
Fixes #14417