-
Notifications
You must be signed in to change notification settings - Fork 5.1k
wip: Fix image loading with podman driver #21932
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
base: master
Are you sure you want to change the base?
Conversation
|
Hi @obnoxxx. Thanks for your PR. I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
Can one of the admins verify this patch? |
medyagh
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you plz provide before/after this PR output?
pkg/minikube/node/cache.go
Outdated
| return fmt.Errorf("not yet implemented, see issue #8426") | ||
| } | ||
| if driver.IsDocker(cc.Driver) && err == nil { | ||
| if err == nil && (driver.IsDocker(cc.Driver) || (cc.Driver == driver.Podman)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can use driver.IsKIC(cc.Driver) here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done. Thanks for the hint!
Will do, tomorrow. |
d0996ef to
00018e5
Compare
|
@medyagh wrote:
done. |
|
/assign @medyagh |
|
/ok-to-test |
medyagh
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
plz run make gomodtidy
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
See the first commit. I had done that first. |
9c2833f to
922b90d
Compare
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: obnoxxx The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
I ave done it again now and squashed with the first commit. |
|
/retest-required |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This fixes issue 8426 Signed-off-by: Michael Adam <[email protected]>
922b90d to
84a896b
Compare
|
@obnoxxx: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
for some reason, when I checked it now, the gomodtidy commit had an empty diff. So I removed it from the PR. Locally, Not sure what was different before. |
|
kvm2 driver with docker runtime Times for minikube start: 42.7s 43.6s 40.8s 44.4s 40.8s Times for minikube (PR 21932) ingress: 15.8s 15.8s 18.8s 15.8s 15.8s docker driver with docker runtime Times for minikube start: 24.7s 20.9s 26.7s 21.5s 20.5s Times for minikube (PR 21932) ingress: 11.6s 12.6s 13.6s 12.7s 10.6s docker driver with containerd runtime Times for minikube start: 21.1s 21.2s 22.8s 21.7s 20.8s Times for minikube ingress: 22.1s 23.1s 23.1s 23.1s 22.1s |
|
Here are the number of top 10 failed tests in each environments with lowest flake rate.
Besides the following environments also have failed tests:
To see the flake rates of all tests by environment, click here. |
|
|
||
| if driver.IsKIC(cc.Driver) { | ||
| klog.Infof("Loading %s from local cache", img) | ||
| if finalImg, err = download.CacheToDaemon(img); err == nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function needs to add support for podman, currently it only supports docker...
The easiest is probably forking a call to exec, had do to that anyway (for the digest)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@afbjorklund wrote:
This function needs to add support for podman, currently it only supports docker...
The easiest is probably forking a call to exec, had do to that anyway (for the digest)
good point, but the ToDaemon part of the function's name does not really apply to podman, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can either rename the function to more a more generic name, or make another one just for Podman.
Calling it "daemon" in the first place, was focusing on the wrong part of "Docker daemon" anyway...
daemon.Write (pkg/v1/daemon)
github.com/docker/docker/client
|
My current thinking is to maybe just stop this effort anc close PR. wdyt, @medyagh , @afbjorklund ? |
You can close the PR, if you don't want to work on it further right now It can either be reopened later, or you can open a new PR instead Another approach would be to just change the wording of the message... Since the download when just fine, it was the image load that was missing.
|
|
If you do decide to work on it, you have the building blocks in pkg/drivers/kic/oci func LoadImageFromPath(ctx context.Context, ociBin string, p string) error {
rr, err := runCmd(exec.CommandContext(ctx, ociBin, "load", "-i", p)) |
This fixes the image loading for the podman driver removing the annoying message
Resolves: #8426
without this patch
so there is the error message but it seems to have succeeded.
with the patch
So this is working fine.