Image load: Allow loading local images from tar or cache #10807

afbjorklund · 2021-03-13T13:37:12Z

Now can load both from daemon/remote and from tarball:

minikube image load image
minikube image load image.tar

To be on the safe side, one should use qualified names:

minikube image load docker.io/image
minikube image load ./image.tar

Also allows for loading more than one image at a time...

Closes #10744

Previously only allowed loading from daemon or remote via the cache, and not directly from local tarball.

They need to all be cached or all be local, though. If one appears to be local, then assume that all are.

medyagh · 2021-03-23T04:32:02Z

@afbjorklund please rebase, so we could include in this release for end of march

medyagh · 2021-03-23T07:06:44Z

/ok-to-test

pkg/minikube/image/image.go

medyagh · 2021-03-23T07:15:25Z

@afbjorklund this pr does not change the behavior of Image Load to not load to all profiles, right ?

Please clarify,
Currently we have a —all flag for cache add Is cache being addded to all profiles only when —all is set ?

(It would be great if our integration test would have covered it(

minikube-pr-bot · 2021-03-23T08:11:36Z

kvm2 Driver
Times for minikube: 67.6s 64.5s 63.2s
Average time for minikube: 65.1s

Times for Minikube (PR 10807): 65.7s 66.6s 63.8s
Average time for Minikube (PR 10807): 65.4s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.1s     | 0.1s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the kvm2 driver based              | 0.0s     | 0.0s                |
| on user configuration                      |          |                     |
| * Starting control plane node              | 0.0s     | 0.0s                |
| minikube in cluster minikube               |          |                     |
| * Creating kvm2 VM (CPUs=2,                | 40.2s    | 39.7s               |
| Memory=3700MB, Disk=20000MB)               |          |                     |
| ...                                        |          |                     |
| * Preparing Kubernetes v1.20.2             | 2.1s     | 8.6s                |
| on Docker 20.10.3 ...                      |          |                     |
|   - Generating certificates                | 3.9s     | 3.2s                |
| and keys ...                               |          |                     |
|   - Booting up control plane               | 15.6s    | 10.6s               |
| ...                                        |          |                     |
|   - Configuring RBAC rules ...             | 1.3s     | 1.1s                |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.2s     | 1.4s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.6s     | 0.3s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

docker Driver
Times for minikube: 27.2s 28.5s 34.3s
Average time for minikube: 30.0s

Times for Minikube (PR 10807): 28.1s 28.1s 36.6s
Average time for Minikube (PR 10807): 30.9s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.2s     | 0.2s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the docker driver                  | 0.1s     | 0.1s                |
| based on user configuration                |          |                     |
| * Starting control plane node              | 0.1s     | 0.1s                |
| minikube in cluster minikube               |          |                     |
| * Creating docker container                | 11.7s    | 12.2s               |
| (CPUs=2, Memory=3700MB) ...                |          |                     |
| * Preparing Kubernetes v1.20.2             | 16.5s    | 16.1s               |
| on Docker 20.10.3 ...                      |          |                     |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.3s     | 2.1s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.1s     | 0.1s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

afbjorklund · 2021-03-23T11:37:03Z

this pr does not change the behavior of Image Load to not load to all profiles, right ?

It is hardcoded to only load to the current profile. []*config.Profile{profile})

                profile, err := config.LoadProfile(viper.GetString(config.ProfileName))

There are no changes to the "cache" commands, only renamed some internal functions.

Added a "Cache" to the functions that wrap the cache dir, and Load does the load directly.

minikube-pr-bot · 2021-03-23T11:50:32Z

kvm2 Driver
Times for minikube: 67.7s 66.5s 64.3s
Average time for minikube: 66.2s

Times for Minikube (PR 10807): 64.6s 66.1s 65.6s
Average time for Minikube (PR 10807): 65.4s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.1s     | 0.0s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the kvm2 driver based              | 0.0s     | 0.0s                |
| on user configuration                      |          |                     |
| * Starting control plane node              | 0.0s     | 0.0s                |
| minikube in cluster minikube               |          |                     |
| * Creating kvm2 VM (CPUs=2,                | 40.4s    | 39.8s               |
| Memory=3700MB, Disk=20000MB)               |          |                     |
| ...                                        |          |                     |
| * Preparing Kubernetes v1.20.2             | 9.2s     | 9.2s                |
| on Docker 20.10.3 ...                      |          |                     |
|   - Generating certificates                | 2.9s     | 2.7s                |
| and keys ...                               |          |                     |
|   - Booting up control plane               | 10.1s    | 10.3s               |
| ...                                        |          |                     |
|   - Configuring RBAC rules ...             | 1.2s     | 1.3s                |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.4s     | 1.5s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.9s     | 0.2s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

docker Driver
Times for minikube: 29.5s 36.4s 29.9s
Average time for minikube: 32.0s

Times for Minikube (PR 10807): 30.7s 27.8s 29.8s
Average time for Minikube (PR 10807): 29.4s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.2s     | 0.5s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the docker driver                  | 0.1s     | 0.1s                |
| based on user configuration                |          |                     |
| * Starting control plane node              | 0.1s     | 0.1s                |
| minikube in cluster minikube               |          |                     |
| * Creating docker container                | 14.2s    | 12.0s               |
| (CPUs=2, Memory=3700MB) ...                |          |                     |
| * Preparing Kubernetes v1.20.2             | 15.9s    | 15.5s               |
| on Docker 20.10.3 ...                      |          |                     |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.3s     | 1.1s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.1s     | 0.1s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

medyagh · 2021-03-23T22:49:27Z

the cache related tests are failing
https://storage.googleapis.com/minikube-builds/logs/10807/e35057a/Docker_Linux.html#fail_TestFunctional%2fserial%2fCacheCmd%2fcache%2fadd_remote


TestFunctional/serial/CacheCmd/cache/add_remote | 1.4
-- | --
52 | TestFunctional/serial/CacheCmd/cache/add_local | 1.85
53 | TestFunctional/serial/CacheCmd/cache/delete_k8s.gcr.io/pause:3.3 | 0.09
55 | TestFunctional/serial/CacheCmd/cache/verify_cache_inside_node | 0.37
56 | TestFunctional/serial/CacheCmd/cache/cache_reload | 1.44
57 | TestFunctional/serial/CacheCmd/cache/delete

medyagh

plz check the cache tests failures

https://storage.googleapis.com/minikube-builds/logs/10807/e35057a/Docker_Linux.html#fail_TestFunctional%2fserial%2fCacheCmd%2fcache%2fadd_remote

afbjorklund · 2021-03-24T12:50:07Z

plz check the cache tests failures

it didn't fall back to remote correctly

It was supposed to try the local daemon first, and if that fails then also try the remote registry.

But make it possible to select which to try, and error out if not selecting any of the methods....

minikube-pr-bot · 2021-03-24T13:00:29Z

kvm2 Driver
Times for minikube: 65.3s 65.9s 68.1s
Average time for minikube: 66.4s

Times for Minikube (PR 10807): 66.5s 65.5s 64.5s
Average time for Minikube (PR 10807): 65.5s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.0s     | 0.0s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the kvm2 driver based              | 0.0s     | 0.0s                |
| on user configuration                      |          |                     |
| * Starting control plane node              | 0.0s     | 0.0s                |
| minikube in cluster minikube               |          |                     |
| * Creating kvm2 VM (CPUs=2,                | 40.4s    | 39.8s               |
| Memory=3700MB, Disk=20000MB)               |          |                     |
| ...                                        |          |                     |
| * Preparing Kubernetes v1.20.2             | 8.9s     |                     |
| on Docker 20.10.4 ...                      |          |                     |
|   - Generating certificates                | 3.3s     | 3.1s                |
| and keys ...                               |          |                     |
|   - Booting up control plane               | 10.4s    | 10.1s               |
| ...                                        |          |                     |
|   - Configuring RBAC rules ...             | 1.1s     | 1.1s                |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.3s     | 1.3s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.9s     |                     |
| default-storageclass,                      |          |                     |
| storage-provisioner                        |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

docker Driver
Times for minikube: 28.9s 27.2s 26.3s
Average time for minikube: 27.4s

Times for Minikube (PR 10807): 31.3s 27.7s 28.3s
Average time for Minikube (PR 10807): 29.1s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.2s     | 0.2s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the docker driver                  | 0.1s     | 0.1s                |
| based on user configuration                |          |                     |
| * Starting control plane node              | 0.1s     | 0.1s                |
| minikube in cluster minikube               |          |                     |
| * Creating docker container                | 10.4s    | 10.9s               |
| (CPUs=2, Memory=3700MB) ...                |          |                     |
| * Preparing Kubernetes v1.20.2             | 15.4s    | 16.4s               |
| on Docker 20.10.3 ...                      |          |                     |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.1s     | 1.3s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.1s     | 0.1s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

afbjorklund · 2021-03-24T13:29:26Z

@medyagh : There is also some bogus message about "cache" being replaced by "image load" ?

! "minikube cache" will be deprecated in upcoming versions, please switch to "minikube image load"

Even though image doesn't have any "memory".

So you have to remember to load them again

minikube-pr-bot · 2021-03-24T13:40:59Z

kvm2 Driver
Times for minikube: 68.2s 65.7s 65.7s
Average time for minikube: 66.5s

Times for Minikube (PR 10807): 64.8s 66.2s 65.7s
Average time for Minikube (PR 10807): 65.6s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.1s     | 0.0s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the kvm2 driver based              | 0.0s     | 0.0s                |
| on user configuration                      |          |                     |
| * Starting control plane node              | 0.0s     | 0.0s                |
| minikube in cluster minikube               |          |                     |
| * Creating kvm2 VM (CPUs=2,                | 41.2s    | 40.7s               |
| Memory=3700MB, Disk=20000MB)               |          |                     |
| ...                                        |          |                     |
| * Preparing Kubernetes v1.20.2             | 8.9s     | 15.9s               |
| on Docker 20.10.4 ...                      |          |                     |
|   - Generating certificates                | 2.6s     | 1.2s                |
| and keys ...                               |          |                     |
|   - Booting up control plane               | 10.3s    | 4.9s                |
| ...                                        |          |                     |
|   - Configuring RBAC rules ...             | 1.2s     | 0.8s                |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.4s     | 1.3s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 1.0s     | 0.6s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

docker Driver
Times for minikube: 28.2s 33.2s 31.5s
Average time for minikube: 31.0s

Times for Minikube (PR 10807): 29.2s 31.4s 34.3s
Average time for Minikube (PR 10807): 31.6s

Averages Time Per Log

+--------------------------------------------+----------+---------------------+
|                    LOG                     | MINIKUBE | MINIKUBE (PR 10807) |
+--------------------------------------------+----------+---------------------+
| * minikube v1.18.1 on Debian               | 0.3s     | 0.2s                |
| 9.11 (kvm/amd64)                           |          |                     |
| * Using the docker driver                  | 0.1s     | 0.1s                |
| based on user configuration                |          |                     |
| * Starting control plane node              | 0.1s     | 0.1s                |
| minikube in cluster minikube               |          |                     |
| * Creating docker container                | 12.2s    | 13.8s               |
| (CPUs=2, Memory=3700MB) ...                |          |                     |
| * Preparing Kubernetes v1.20.2             | 16.9s    | 15.9s               |
| on Docker 20.10.3 ...                      |          |                     |
| * Verifying Kubernetes                     | 0.1s     | 0.1s                |
| components...                              |          |                     |
|   - Using image                            | 1.2s     | 1.4s                |
| gcr.io/k8s-minikube/storage-provisioner:v4 |          |                     |
| * Enabled addons:                          | 0.1s     | 0.1s                |
| storage-provisioner,                       |          |                     |
| default-storageclass                       |          |                     |
| * Done! kubectl is now                     | 0.0s     | 0.0s                |
| configured to use "minikube"               |          |                     |
| cluster and "default"                      |          |                     |
| namespace by default                       |          |                     |
+--------------------------------------------+----------+---------------------+

medyagh · 2021-03-25T00:48:41Z

@medyagh : There is also some bogus message about "cache" being replaced by "image load" ?

! "minikube cache" will be deprecated in upcoming versions, please switch to "minikube image load"

Even though image doesn't have any "memory".

So you have to remember to load them again

yeah saw that, thats not very good, we gotta remove that

k8s-ci-robot · 2021-03-25T00:49:58Z

[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

afbjorklund requested review from medyagh and priyawadhwa March 13, 2021 13:37

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 13, 2021

k8s-ci-robot requested review from RA489 and tstromberg March 13, 2021 13:37

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 13, 2021

afbjorklund added 2 commits March 13, 2021 14:43

Allow loading local images as well as from cache

0d99d18

Previously only allowed loading from daemon or remote via the cache, and not directly from local tarball.

Allow loading more than one image at a time

ea1d023

They need to all be cached or all be local, though. If one appears to be local, then assume that all are.

afbjorklund force-pushed the load-new branch from 7662c08 to ea1d023 Compare March 13, 2021 13:43

afbjorklund mentioned this pull request Mar 14, 2021

Add basic documentation for minikube image command #10819

Merged

afbjorklund added 2 commits March 16, 2021 19:35

Allow loading image from standard input stream

3e4a020

Add example parameters to the usage help text

eea380f

afbjorklund force-pushed the load-new branch from c7c3ab3 to eea380f Compare March 16, 2021 18:41

afbjorklund added 3 commits March 22, 2021 20:43

Fix whitespace to make goimports happy

e1eaeba

Make it possible to choose daemon or remote

fd4a62f

Cleanup the weird-looking comment indentation

1ab1ead

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 23, 2021

afbjorklund added 2 commits March 23, 2021 07:02

Merge branch 'master' into load-new

e064eb1

Refactor: add daemon function matching remote

9945462

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 23, 2021

afbjorklund added 2 commits March 23, 2021 07:52

Merge branch 'master' into load-new

6fd8a05

Regenerate documentation with the new load help

3bcb5a1

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Mar 23, 2021

medyagh added the pr_verified label Mar 23, 2021

medyagh changed the title ~~Allow loading local images as well as from cache~~ Image load: Allow loading local images from tar or cache Mar 23, 2021

medyagh reviewed Mar 23, 2021

View reviewed changes

pkg/minikube/image/image.go Outdated Show resolved Hide resolved

kubernetes deleted a comment from minikube-pr-bot Mar 23, 2021

Use accessor methods instead of just variables

e35057a

medyagh approved these changes Mar 23, 2021

View reviewed changes

medyagh self-requested a review March 23, 2021 22:49

medyagh requested changes Mar 23, 2021

View reviewed changes

Don't fail after daemon errors without remote

8a027b5

afbjorklund requested a review from medyagh March 24, 2021 12:50

Clean up and fix logic after all refactoring

6ce802b

afbjorklund force-pushed the load-new branch from 297f910 to 6ce802b Compare March 24, 2021 14:08

medyagh approved these changes Mar 25, 2021

View reviewed changes

medyagh merged commit 77c6de3 into kubernetes:master Mar 25, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Image load: Allow loading local images from tar or cache #10807

Image load: Allow loading local images from tar or cache #10807

afbjorklund commented Mar 13, 2021

medyagh commented Mar 23, 2021

medyagh commented Mar 23, 2021

medyagh commented Mar 23, 2021

minikube-pr-bot commented Mar 23, 2021

afbjorklund commented Mar 23, 2021 •

edited

Loading

minikube-pr-bot commented Mar 23, 2021

medyagh commented Mar 23, 2021

medyagh left a comment

afbjorklund commented Mar 24, 2021 •

edited

Loading

minikube-pr-bot commented Mar 24, 2021

afbjorklund commented Mar 24, 2021

minikube-pr-bot commented Mar 24, 2021

medyagh commented Mar 25, 2021

k8s-ci-robot commented Mar 25, 2021

Image load: Allow loading local images from tar or cache #10807

Image load: Allow loading local images from tar or cache #10807

Conversation

afbjorklund commented Mar 13, 2021

medyagh commented Mar 23, 2021

medyagh commented Mar 23, 2021

medyagh commented Mar 23, 2021

minikube-pr-bot commented Mar 23, 2021

afbjorklund commented Mar 23, 2021 • edited Loading

minikube-pr-bot commented Mar 23, 2021

medyagh commented Mar 23, 2021

medyagh left a comment

Choose a reason for hiding this comment

afbjorklund commented Mar 24, 2021 • edited Loading

minikube-pr-bot commented Mar 24, 2021

afbjorklund commented Mar 24, 2021

minikube-pr-bot commented Mar 24, 2021

medyagh commented Mar 25, 2021

k8s-ci-robot commented Mar 25, 2021

afbjorklund commented Mar 23, 2021 •

edited

Loading

afbjorklund commented Mar 24, 2021 •

edited

Loading