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

base-image: Allow using podman as well as docker daemon #11063

Merged
merged 4 commits into from
May 8, 2021

Conversation

afbjorklund
Copy link
Collaborator

@afbjorklund afbjorklund commented Apr 10, 2021

Rewrite functions:

  • DigestByDockerLib
  • ExistsImageInDaemon
  • LoadFromTarball
  • WriteImageToDaemon

Closes #8577

See #10918 (comment)

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 10, 2021
@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Apr 10, 2021

Now things are implemented both for "daemon" (docker) and for "podman".

@ilya-zuyev
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Apr 14, 2021
@minikube-pr-bot
Copy link

kvm2 Driver

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11063) |
+----------------+----------+---------------------+
| minikube start | 49.6s    | 50.9s               |
| enable ingress | 36.3s    | 35.3s               |
+----------------+----------+---------------------+

Times for minikube start: 50.4s 50.0s 48.7s 51.3s 47.5s
Times for minikube (PR 11063) start: 53.5s 50.0s 51.3s 52.1s 47.7s

Times for minikube ingress: 37.8s 34.8s 35.8s 34.7s 38.3s
Times for minikube (PR 11063) ingress: 34.7s 36.8s 36.2s 34.3s 34.3s

docker Driver

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11063) |
+----------------+----------+---------------------+
| minikube start | 21.9s    | 21.9s               |
| enable ingress | 30.9s    | 31.3s               |
+----------------+----------+---------------------+

Times for minikube start: 23.0s 20.7s 22.2s 22.0s 21.4s
Times for minikube (PR 11063) start: 21.7s 23.1s 20.9s 21.3s 22.5s

Times for minikube (PR 11063) ingress: 31.0s 32.0s 33.5s 30.0s 30.0s
Times for minikube ingress: 32.5s 29.5s 33.5s 29.5s 29.5s

@medyagh
Copy link
Member

medyagh commented Apr 19, 2021

@k8s-ci-robot
Copy link
Contributor

@afbjorklund: PR needs rebase.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 23, 2021
@afbjorklund afbjorklund removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 24, 2021
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11063) |
+----------------+----------+---------------------+
| minikube start | 51.4s    | 48.9s               |
| enable ingress | 35.4s    | 35.2s               |
+----------------+----------+---------------------+

Times for minikube ingress: 34.7s 36.3s 35.3s 35.8s 35.2s
Times for minikube (PR 11063) ingress: 35.2s 34.2s 35.3s 35.2s 36.3s

Times for minikube (PR 11063) start: 50.8s 48.5s 50.2s 48.8s 46.4s
Times for minikube start: 54.6s 54.0s 47.2s 48.4s 52.7s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11063) |
+----------------+----------+---------------------+
| minikube start | 21.9s    | 21.3s               |
| enable ingress | 29.7s    | 30.3s               |
+----------------+----------+---------------------+

Times for minikube ingress: 30.0s 28.5s 29.5s 32.0s 28.5s
Times for minikube (PR 11063) ingress: 29.5s 33.5s 29.0s 32.5s 27.0s

Times for minikube start: 21.6s 21.8s 22.6s 21.9s 21.9s
Times for minikube (PR 11063) start: 21.3s 21.3s 21.6s 20.9s 21.5s

docker driver with containerd runtime
error collecting results for docker driver: timing run 0 with minikube: timing cmd: [out/minikube addons enable ingress]: waiting for minikube: exit status 10

@medyagh
Copy link
Member

medyagh commented Apr 26, 2021

@afbjorklund one more rebase please

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Apr 26, 2021

@afbjorklund one more rebase please

Hopefully this also fixes the scenario with the new "kic" cache, where the image is already loaded into daemon/podman.

Started the (informal) process of adding podman to the go-container registry API, but I'm not sure if/when that will be...

v1.Image
https://pkg.go.dev/github.com/google/go-containerregistry/pkg/v1

Sources

  • remote.Image
  • tarball.Image
  • daemon.Image
  • podman.Image
  • layout.Image
  • random.Image

Sinks

  • remote.Write
  • tarball.Write
  • daemon.Write
  • podman.Write
  • legacy/tarball.Write
  • layout.AppendImage

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11063) |
+----------------+----------+---------------------+
| minikube start | 50.9s    | 47.6s               |
| enable ingress | 38.7s    | 41.0s               |
+----------------+----------+---------------------+

Times for minikube start: 53.7s 50.2s 47.6s 49.8s 53.0s
Times for minikube (PR 11063) start: 47.5s 47.9s 47.9s 47.5s 47.3s

Times for minikube ingress: 42.8s 36.3s 35.3s 36.3s 42.8s
Times for minikube (PR 11063) ingress: 38.2s 36.8s 43.3s 43.2s 43.7s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11063) |
+----------------+----------+---------------------+
| minikube start | 21.8s    | 21.5s               |
| enable ingress | 36.2s    | 33.9s               |
+----------------+----------+---------------------+

Times for minikube start: 22.3s 21.5s 21.4s 21.6s 22.0s
Times for minikube (PR 11063) start: 21.2s 21.9s 20.9s 21.4s 22.1s

Times for minikube ingress: 37.5s 36.5s 31.5s 38.0s 37.5s
Times for minikube (PR 11063) ingress: 37.5s 33.0s 32.4s 34.5s 32.0s

docker driver with containerd runtime
error collecting results for docker driver: timing run 0 with minikube: timing cmd: [out/minikube addons enable ingress]: waiting for minikube: exit status 10

@k8s-ci-robot
Copy link
Contributor

@afbjorklund: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-minikube-build 9a9e804 link /test pull-minikube-build

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/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, medyagh

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:
  • OWNERS [afbjorklund,medyagh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@medyagh medyagh merged commit 807440a into kubernetes:master May 8, 2021
@medyagh medyagh changed the title Allow using podman as well as docker daemon base-image: Allow using podman as well as docker daemon May 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Calling Docker daemon even for other container runtimes
5 participants