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 "--native-ssh" flag of "minikube ssh" #9417

Merged
merged 1 commit into from
Oct 14, 2020
Merged

Fix "--native-ssh" flag of "minikube ssh" #9417

merged 1 commit into from
Oct 14, 2020

Conversation

joshmue
Copy link
Contributor

@joshmue joshmue commented Oct 8, 2020

The "--native-ssh" flag was completely discarded; This PR fixes that and also makes sure that the SSH client is created after it is configured accordingly.

Refs #8359

Signing of CLA will follow is done.

@k8s-ci-robot
Copy link
Contributor

Welcome @joshmue!

It looks like this is your first PR to kubernetes/minikube 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/minikube has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@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 Oct 8, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @joshmue. 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
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


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 k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 8, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: joshmue
To complete the pull request process, please assign tstromberg after the PR has been reviewed.
You can assign the PR to them by writing /assign @tstromberg in a comment when ready.

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@sharifelgamal
Copy link
Collaborator

This looks like it's doing the right thing. I'll mark it for testing once the CLA is signed.

In the previous state, the flag was discarded. This commit fixes
that and also makes sure that the SSH client is created after the
default client type is configured according to the flag.
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 9, 2020
@codecov-io
Copy link

Codecov Report

Merging #9417 into master will decrease coverage by 0.73%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9417      +/-   ##
==========================================
- Coverage   29.51%   28.78%   -0.74%     
==========================================
  Files         170      172       +2     
  Lines       10307    10608     +301     
==========================================
+ Hits         3042     3053      +11     
- Misses       6842     7131     +289     
- Partials      423      424       +1     
Impacted Files Coverage Δ
pkg/minikube/machine/ssh.go 0.00% <0.00%> (ø)
cmd/minikube/cmd/ssh.go 10.52% <100.00%> (ø)
pkg/util/utils.go 61.76% <0.00%> (-5.98%) ⬇️
pkg/minikube/config/config.go 41.79% <0.00%> (-4.12%) ⬇️
cmd/minikube/cmd/stop.go 4.00% <0.00%> (-1.89%) ⬇️
pkg/addons/addons.go 34.25% <0.00%> (-1.79%) ⬇️
pkg/minikube/machine/info.go 44.44% <0.00%> (-1.02%) ⬇️
cmd/minikube/cmd/start_flags.go 47.16% <0.00%> (-0.57%) ⬇️
cmd/minikube/cmd/delete.go 19.06% <0.00%> (-0.55%) ⬇️
cmd/minikube/cmd/start.go 9.38% <0.00%> (-0.32%) ⬇️
... and 21 more

@joshmue
Copy link
Contributor Author

joshmue commented Oct 12, 2020

This looks like it's doing the right thing. I'll mark it for testing once the CLA is signed.

@sharifelgamal (Just in case you did not receive any notification): The CLA is signed now.

@sharifelgamal
Copy link
Collaborator

/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 Oct 12, 2020
@kubernetes kubernetes deleted a comment from minikube-pr-bot Oct 12, 2020
@minikube-pr-bot
Copy link

kvm2 Driver
Times for minikube: 60.8s 61.8s 59.9s
Average time for minikube: 60.8s

Times for Minikube (PR 9417): 61.3s 59.8s 59.8s
Average time for Minikube (PR 9417): 60.3s

Averages Time Per Log

+-------------------------------------------------------------+----------+--------------------+
|                             LOG                             | MINIKUBE | MINIKUBE (PR 9417) |
+-------------------------------------------------------------+----------+--------------------+
| * minikube v1.14.0-beta.0 on                                | 0.1s     |                    |
| Debian 9.11                                                 |          |                    |
| * Using the kvm2 driver based                               | 0.0s     | 0.0s               |
| on user configuration                                       |          |                    |
| * minikube 1.14.0 is available! Download it:                | 0.0s     |                    |
| https://github.com/kubernetes/minikube/releases/tag/v1.14.0 |          |                    |
| * To disable this notice,                                   | 0.0s     |                    |
| run: 'minikube config set                                   |          |                    |
| WantUpdateNotification false'                               |          |                    |
|                                                             | 0.0s     | 0.0s               |
| * Starting control plane node                               |          |                    |
| minikube in cluster minikube                                |          |                    |
| * Creating kvm2 VM (CPUs=2,                                 |          |                    |
| Memory=3700MB, Disk=20000MB)                                |          |                    |
| ...                                                         |          |                    |
| * Preparing Kubernetes v1.19.2                              |          |                    |
| on Docker 19.03.12 ...                                      |          |                    |
| * Verifying Kubernetes                                      |          |                    |
| components...                                               |          |                    |
| * Enabled addons:                                           |          |                    |
| storage-provisioner,                                        |          |                    |
| default-storageclass                                        |          |                    |
|                                                             |          |                    |
| * Want kubectl v1.19.2? Try                                 |          |                    |
| 'minikube kubectl -- get pods                               |          |                    |
| -A'                                                         |          |                    |
| * Done! kubectl is now                                      |          |                    |
| configured to use "minikube"                                |          |                    |
| by default                                                  |          |                    |
+-------------------------------------------------------------+----------+--------------------+

docker Driver
Times for minikube: 29.7s 28.9s 28.0s
Average time for minikube: 28.9s

Times for Minikube (PR 9417): 30.5s 29.2s 29.2s
Average time for Minikube (PR 9417): 29.6s

Averages Time Per Log

+--------------------------------+----------+--------------------+
|              LOG               | MINIKUBE | MINIKUBE (PR 9417) |
+--------------------------------+----------+--------------------+
| * minikube v1.14.0-beta.0 on   | 0.2s     |                    |
| Debian 9.11                    |          |                    |
| * 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    | 9.0s     | 9.0s               |
| (CPUs=2, Memory=3700MB) ...    |          |                    |
| * Preparing Kubernetes v1.19.2 | 18.4s    | 19.0s              |
| on Docker 19.03.8 ...          |          |                    |
| * Verifying Kubernetes         | 1.0s     | 1.1s               |
| components...                  |          |                    |
| * Enabled addons:              | 0.1s     | 0.2s               |
| storage-provisioner,           |          |                    |
| default-storageclass           |          |                    |
|                                | 0.0s     | 0.2s               |
| * Want kubectl v1.19.2? Try    |          |                    |
| 'minikube kubectl -- get pods  |          |                    |
| -A'                            |          |                    |
| * Done! kubectl is now         |          |                    |
| configured to use "minikube"   |          |                    |
| by default                     |          |                    |
+--------------------------------+----------+--------------------+

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

@medyagh
Copy link
Member

medyagh commented Oct 13, 2020

/retest-this-please

@sharifelgamal
Copy link
Collaborator

/ok-to-test

@sharifelgamal sharifelgamal merged commit 06a64de into kubernetes:master Oct 14, 2020
@joshmue joshmue deleted the fix_ssh_native_toggle branch October 15, 2020 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants