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.

Sign up for GitHub

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

Jump to bottom

fix: missing tags on images with multiple tags for minikube image list #16578

Merged
merged 3 commits into from Jun 12, 2023
Merged

fix: missing tags on images with multiple tags for minikube image list #16578

merged 3 commits into from Jun 12, 2023

Conversation

ComradeProgrammer
Copy link
Contributor

fixes #16556
fixes #16557
fix missing tags on images with multiple tags for minikube image list

unit tests are also added for cases mentioned in issue 16556 and 16557

Before:

$ minikube image list
...(omit some images)...
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.23.8
k8s.gcr.io/kube-proxy:v1.23.8
k8s.gcr.io/kube-controller-manager:v1.23.8
k8s.gcr.io/kube-apiserver:v1.23.8

After

$ ./minikube image list
...(omit some images)...
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.23.8
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.23.8
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.23.8
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.23.8
k8s.gcr.io/kube-scheduler:v1.23.8
k8s.gcr.io/kube-proxy:v1.23.8
k8s.gcr.io/kube-controller-manager:v1.23.8
k8s.gcr.io/kube-apiserver:v1.23.8

actual image list on node

docker@minikube:~$ docker image ls
REPOSITORY                                                                    TAG       IMAGE ID       CREATED         SIZE
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver            v1.23.8   09d62ad3189b   11 months ago   135MB
k8s.gcr.io/kube-apiserver                                                     v1.23.8   09d62ad3189b   11 months ago   135MB
k8s.gcr.io/kube-scheduler                                                     v1.23.8   afd180ec7435   11 months ago   53.5MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler            v1.23.8   afd180ec7435   11 months ago   53.5MB
k8s.gcr.io/kube-proxy                                                         v1.23.8   db4da8720bcb   11 months ago   112MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy                v1.23.8   db4da8720bcb   11 months ago   112MB
k8s.gcr.io/kube-controller-manager                                            v1.23.8   2b7c5a039984   11 months ago   125MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager   v1.23.8   2b7c5a039984   11 months ago   125MB
...(omit some images)...

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 24, 2023
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 24, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @ComradeProgrammer. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 24, 2023
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

spowelljr
spowelljr requested changes May 24, 2023
View reviewed changes
pkg/minikube/machine/cache_image_test.go Show resolved Hide resolved
pkg/minikube/machine/cache_image_test.go Outdated Show resolved Hide resolved
pkg/minikube/machine/cache_images.go Outdated Show resolved Hide resolved
@ComradeProgrammer ComradeProgrammer force-pushed the image_tags branch 2 times, most recently from 359f7bb to fa650ae Compare May 25, 2023 16:58
spowelljr
spowelljr requested changes Jun 2, 2023
View reviewed changes
pkg/minikube/machine/cache_image_test.go Outdated Show resolved Hide resolved
pkg/minikube/machine/cache_image_test.go Outdated Show resolved Hide resolved
pkg/minikube/machine/cache_images.go Outdated Show resolved Hide resolved
spowelljr
spowelljr requested changes Jun 5, 2023
View reviewed changes
pkg/minikube/machine/cache_image_test.go Outdated Show resolved Hide resolved
pkg/minikube/machine/cache_image_test.go Outdated Show resolved Hide resolved
pkg/minikube/machine/cache_image_test.go Outdated Show resolved Hide resolved
pkg/minikube/machine/cache_images.go Outdated Show resolved Hide resolved
@ComradeProgrammer @spowelljr
Update pkg/minikube/machine/cache_image_test.go
8a06b68 
Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com>
@spowelljr
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 9, 2023
@minikube-pr-bot

This comment has been minimized.

Sign in to view
@minikube-pr-bot

This comment has been minimized.

Sign in to view
@ComradeProgrammer @spowelljr
Apply suggestions from code review
d4c33ff 
Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com>
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 16578) |
+----------------+----------+---------------------+
| minikube start | 52.0s    | 52.1s               |
| enable ingress | 27.5s    | 27.6s               |
+----------------+----------+---------------------+

Times for minikube start: 53.6s 53.7s 50.5s 53.1s 49.2s
Times for minikube (PR 16578) start: 53.0s 52.2s 51.6s 52.6s 51.3s

Times for minikube ingress: 27.2s 29.1s 24.7s 29.1s 27.2s
Times for minikube (PR 16578) ingress: 24.7s 27.7s 28.7s 28.7s 28.2s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 16578) |
+----------------+----------+---------------------+
| minikube start | 23.9s    | 22.5s               |
| enable ingress | 21.1s    | 20.9s               |
+----------------+----------+---------------------+

Times for minikube start: 24.3s 24.8s 24.9s 22.7s 22.7s
Times for minikube (PR 16578) start: 22.2s 21.1s 24.8s 22.7s 21.8s

Times for minikube ingress: 20.9s 19.8s 22.9s 20.8s 20.9s
Times for minikube (PR 16578) ingress: 20.9s 20.8s 20.9s 20.8s 20.8s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 16578) |
+----------------+----------+---------------------+
| minikube start | 22.5s    | 22.2s               |
| enable ingress | 31.9s    | 34.9s               |
+----------------+----------+---------------------+

Times for minikube start: 21.6s 23.0s 20.8s 23.4s 23.8s
Times for minikube (PR 16578) start: 20.1s 23.6s 23.1s 23.2s 21.0s

Times for minikube ingress: 31.4s 31.3s 30.3s 19.4s 47.3s
Times for minikube (PR 16578) ingress: 32.3s 32.3s 31.4s 31.3s 47.3s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Hyperkit_macOS TestMultiNode/serial/DeleteNode (gopogh) 0.00 (chart)
Hyperkit_macOS TestMultiNode/serial/ProfileList (gopogh) 0.00 (chart)
Hyperkit_macOS TestMultiNode/serial/RestartMultiNode (gopogh) 0.00 (chart)
Hyperkit_macOS TestMultiNode/serial/StopMultiNode (gopogh) 0.00 (chart)
Hyperkit_macOS TestMultiNode/serial/DeployApp2Nodes (gopogh) 0.67 (chart)
Hyperkit_macOS TestMultiNode/serial/FreshStart2Nodes (gopogh) 0.67 (chart)
Hyperkit_macOS TestMultiNode/serial/PingHostFrom2Pods (gopogh) 0.67 (chart)
Hyperkit_macOS TestMultiNode/serial/StartAfterStop (gopogh) 0.67 (chart)
Hyperkit_macOS TestMultiNode/serial/StopNode (gopogh) 0.67 (chart)
Hyperkit_macOS TestMultiNode/serial/AddNode (gopogh) 2.00 (chart)
Hyperkit_macOS TestMultiNode/serial/CopyFile (gopogh) 2.00 (chart)
Hyperkit_macOS TestMultiNode/serial/ValidateNameConflict (gopogh) 3.33 (chart)
Docker_Linux_containerd_arm64 TestFunctional/serial/LogsFileCmd (gopogh) 5.81 (chart)
QEMU_macOS TestMinikubeProfile (gopogh) 6.38 (chart)
QEMU_macOS TestFunctional/parallel/ImageCommands/ImageListYaml (gopogh) 12.06 (chart)

To see the flake rates of all tests by environment, click here.

spowelljr
spowelljr approved these changes Jun 12, 2023
View reviewed changes
Copy link
Member

@spowelljr spowelljr 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, thanks for the PR

@spowelljr spowelljr merged commit 3eb2d20 into kubernetes:master Jun 12, 2023
23 of 35 checks passed
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ComradeProgrammer, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spowelljr spowelljr spowelljr approved these changes

@medyagh medyagh Awaiting requested review from medyagh

Assignees
No one assigned
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
Milestone
No milestone
5 participants
@ComradeProgrammer @k8s-ci-robot @minikube-bot @spowelljr @minikube-pr-bot