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

Fix getting of gateway IP for podman driver #11300

Merged
merged 12 commits into from
May 15, 2021

Conversation

ilya-zuyev
Copy link
Contributor

Fixes #11293

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 5, 2021
@k8s-ci-robot k8s-ci-robot requested review from prasadkatti and prezha May 5, 2021 22:10
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 5, 2021
@medyagh
Copy link
Member

medyagh commented May 6, 2021

/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 May 6, 2021
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 52.2s    | 53.0s               |
| enable ingress | 37.1s    | 38.1s               |
+----------------+----------+---------------------+

Times for minikube start: 54.9s 51.8s 50.7s 52.2s 51.6s
Times for minikube (PR 11300) start: 54.7s 53.2s 52.8s 53.4s 51.1s

Times for minikube ingress: 44.0s 35.5s 34.8s 35.9s 35.4s
Times for minikube (PR 11300) ingress: 42.0s 42.7s 35.4s 35.4s 34.8s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 22.5s    | 22.6s               |
| enable ingress | 33.2s    | 29.7s               |
+----------------+----------+---------------------+

Times for minikube (PR 11300) start: 22.0s 22.6s 23.1s 22.6s 22.9s
Times for minikube start: 22.3s 22.4s 22.2s 22.4s 23.1s

Times for minikube ingress: 32.0s 39.1s 36.5s 30.1s 28.5s
Times for minikube (PR 11300) ingress: 29.0s 32.0s 33.0s 29.0s 25.5s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 45.6s    | 46.2s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 44.5s 43.8s 47.3s 43.8s 48.9s
Times for minikube (PR 11300) start: 48.4s 43.6s 42.9s 47.2s 49.0s

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 48.8s    | 47.8s               |
| enable ingress | 42.8s    | 39.1s               |
+----------------+----------+---------------------+

Times for minikube ingress: 43.3s 43.7s 43.7s 46.3s 36.8s
Times for minikube (PR 11300) ingress: 42.8s 35.8s 36.8s 44.3s 35.7s

Times for minikube start: 49.2s 49.2s 47.7s 48.0s 49.6s
Times for minikube (PR 11300) start: 49.3s 46.2s 48.3s 46.9s 48.0s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 22.1s    | 21.6s               |
| enable ingress | 34.4s    | 35.6s               |
+----------------+----------+---------------------+

Times for minikube start: 22.5s 21.6s 22.7s 21.9s 21.6s
Times for minikube (PR 11300) start: 21.0s 22.2s 22.0s 21.4s 21.5s

Times for minikube ingress: 33.0s 36.0s 34.0s 34.5s 34.5s
Times for minikube (PR 11300) ingress: 38.0s 34.5s 37.0s 33.0s 35.5s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 41.2s    | 45.5s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 30.9s 42.6s 43.5s 46.1s 43.1s
Times for minikube (PR 11300) start: 47.4s 46.6s 43.2s 43.5s 46.8s

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 50.4s    | 49.5s               |
| enable ingress | 35.1s    | 36.2s               |
+----------------+----------+---------------------+

Times for minikube ingress: 34.8s 35.3s 35.3s 35.7s 34.3s
Times for minikube (PR 11300) ingress: 34.2s 34.8s 42.7s 34.3s 35.2s

Times for minikube (PR 11300) start: 47.2s 50.0s 47.0s 51.6s 51.6s
Times for minikube start: 53.1s 47.8s 47.9s 47.7s 55.5s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 21.8s    | 21.3s               |
| enable ingress | 30.1s    | 30.4s               |
+----------------+----------+---------------------+

Times for minikube start: 23.0s 21.1s 22.5s 21.8s 20.9s
Times for minikube (PR 11300) start: 21.1s 21.3s 21.3s 21.5s 21.4s

Times for minikube ingress: 28.0s 32.0s 31.0s 29.0s 30.5s
Times for minikube (PR 11300) ingress: 30.5s 28.5s 28.0s 32.0s 33.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 40.8s    | 45.9s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 30.8s 42.9s 43.8s 43.0s 43.3s
Times for minikube (PR 11300) start: 48.6s 46.6s 43.2s 47.3s 43.9s

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 49.7s    | 50.0s               |
| enable ingress | 41.3s    | 41.5s               |
+----------------+----------+---------------------+

Times for minikube ingress: 48.3s 35.7s 35.7s 43.2s 43.4s
Times for minikube (PR 11300) ingress: 37.3s 36.7s 44.9s 43.8s 44.8s

Times for minikube (PR 11300) start: 51.2s 49.2s 50.9s 49.4s 49.1s
Times for minikube start: 54.0s 50.8s 47.9s 48.9s 46.6s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 27.1s    | 21.4s               |
| enable ingress | 34.6s    | 34.2s               |
+----------------+----------+---------------------+

Times for minikube start: 48.3s 21.6s 21.9s 21.9s 21.9s
Times for minikube (PR 11300) start: 21.3s 22.8s 20.9s 21.4s 20.7s

Times for minikube ingress: 37.2s 34.5s 34.5s 33.5s 33.5s
Times for minikube (PR 11300) ingress: 34.0s 34.0s 35.0s 34.0s 34.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 43.5s    | 45.2s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 44.5s 43.2s 43.6s 43.2s 43.0s
Times for minikube (PR 11300) start: 44.2s 47.0s 44.5s 47.2s 43.1s

pkg/drivers/kic/oci/network.go Show resolved Hide resolved
}
}
klog.Infof("Couldn't find gateway for container %s", containerName)
return "", nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be returning error ? instead of nil ?
how about we define an nil error before the for loop

        var gateErr error
	for _, network := range []string{containerName, defaultBridgeName(ociBin)} {....
	       if err != nil {
	      	       gateErr = err 
                }

	
	
	...}

return "", gateErr

Copy link
Contributor Author

@ilya-zuyev ilya-zuyev May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't think this is a good idea. it would break a lot. an empty gateway IP is a valid value and the corresponding err is expected to be nil in other places where containerGatewayIP is called

@medyagh
Copy link
Member

medyagh commented May 14, 2021

@k8s-ci-robot
Copy link
Contributor

@ilya-zuyev: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-minikube-build dcadd32 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.

@ilya-zuyev ilya-zuyev requested a review from medyagh May 14, 2021 21:54
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 46.8s    | 47.2s               |
| enable ingress | 40.2s    | 40.9s               |
+----------------+----------+---------------------+

Times for minikube start: 46.2s 46.4s 47.5s 46.1s 48.0s
Times for minikube (PR 11300) start: 46.3s 46.2s 46.9s 48.1s 48.6s

Times for minikube ingress: 38.2s 43.8s 34.3s 42.8s 41.9s
Times for minikube (PR 11300) ingress: 42.3s 42.8s 34.2s 42.3s 42.7s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 22.1s    | 21.7s               |
| enable ingress | 33.8s    | 36.5s               |
+----------------+----------+---------------------+

Times for minikube start: 23.4s 21.2s 22.4s 21.9s 21.7s
Times for minikube (PR 11300) start: 21.2s 21.5s 22.0s 22.0s 21.5s

Times for minikube ingress: 34.0s 37.5s 33.0s 32.5s 32.0s
Times for minikube (PR 11300) ingress: 34.5s 36.5s 38.5s 35.0s 38.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11300) |
+----------------+----------+---------------------+
| minikube start | 41.3s    | 45.3s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 31.7s 43.7s 44.1s 43.4s 43.4s
Times for minikube (PR 11300) start: 47.8s 44.2s 43.6s 47.2s 43.6s

Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ilya-zuyev

@medyagh medyagh merged commit 707af50 into kubernetes:master May 15, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ilya-zuyev, 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:

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

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestFunctional/parallel/MountCmd fails in GitHub actions with podman driver
4 participants