Use profile name as cluster/node name #6200

laozc · 2020-01-03T09:42:59Z

The node name is always minikube nowadays and this PR allows user to pick up one with --node-name.
If not specified, the node will be named minikube for the default profile name (minikube) or [PROFILE]-minikube.
For none driver the default node name will be set to the host name.

fixes #2800 #4063

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

minikube-bot · 2020-01-03T09:43:02Z

Can one of the admins verify this patch?

k8s-ci-robot · 2020-01-03T09:43:07Z

Hi @laozc. 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 · 2020-01-03T09:43:19Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: laozc
To complete the pull request process, please assign priyawadhwa
You can assign the PR to them by writing /assign @priyawadhwa 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:

OWNERS

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

codecov-io · 2020-01-03T09:48:23Z

Codecov Report

Merging #6200 into master will decrease coverage by 0.41%.
The diff coverage is 26.57%.

@@            Coverage Diff             @@
##           master    #6200      +/-   ##
==========================================
- Coverage   38.38%   37.97%   -0.42%     
==========================================
  Files         124      128       +4     
  Lines        8378     8722     +344     
==========================================
+ Hits         3216     3312      +96     
- Misses       4739     4983     +244     
- Partials      423      427       +4

Impacted Files	Coverage Δ
cmd/minikube/cmd/mount.go	`8.33% <ø> (ø)`	⬆️
pkg/minikube/out/style.go	`91.66% <ø> (ø)`	⬆️
pkg/minikube/bootstrapper/bootstrapper.go	`0% <ø> (ø)`	⬆️
pkg/minikube/driver/driver.go	`71.83% <ø> (+1.96%)`	⬆️
pkg/minikube/command/exec_runner.go	`0% <ø> (ø)`	⬆️
pkg/minikube/bootstrapper/bsutil/files.go	`0% <ø> (ø)`	⬆️
cmd/minikube/cmd/config/profile_list.go	`3.94% <0%> (-0.17%)`	⬇️
cmd/minikube/cmd/kubectl.go	`0% <0%> (ø)`	⬆️
pkg/minikube/assets/addons.go	`36.06% <0%> (-1.87%)`	⬇️
cmd/minikube/cmd/service.go	`17.94% <0%> (-0.48%)`	⬇️
... and 43 more

medyagh

Thank you for this PR ! and this is a good idea !
two thigns
1- please use profile name as node name
2- please make sure the kubeadm config templates also receive the node name.

cmd/minikube/cmd/start.go

RA489 · 2020-01-08T05:42:03Z

/ok-to-test

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

minikube-bot · 2020-01-08T06:59:58Z

All Times minikube: [ 124.025748 131.830177 125.899917]
All Times Minikube (PR 6200): [ 127.337378 129.701776 114.584535]

Average minikube: 127.251947
Average Minikube (PR 6200): 123.874563

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+-----------+--------------------+
| minikube v           |  0.499594 |           0.443831 |
| Creating kvm2        | 49.385835 |          46.897538 |
| Preparing Kubernetes | 51.015655 |          49.806792 |
| Pulling images       |  2.481664 |           2.718491 |
| Launching Kubernetes | 21.223641 |          21.188388 |
| Waiting for cluster  |  2.595839 |           2.770670 |
| Done                 |           |                    |
|                      |  0.049720 |           0.050935 |
+----------------------+-----------+--------------------+

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

minikube-bot · 2020-01-08T08:03:13Z

All Times minikube: [ 123.943295 125.486914 125.486131]
All Times Minikube (PR 6200): [ 126.939861 125.606691 116.104350]

Average minikube: 124.972113
Average Minikube (PR 6200): 122.883634

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+-----------+--------------------+
| minikube v           |  0.467166 |           0.454020 |
| Creating kvm2        | 47.348030 |          47.525562 |
| Preparing Kubernetes | 51.080303 |          48.437225 |
| Pulling images       |  2.971338 |           3.120465 |
| Launching Kubernetes | 20.303665 |          20.545213 |
| Waiting for cluster  |  2.753121 |           2.751876 |
| Done                 |           |                    |
|                      |  0.048363 |           0.045304 |
+----------------------+-----------+--------------------+

medyagh

we also need to change the "clusterName: kubernetes" in the config template files
for example this one
https://github.com/kubernetes/minikube/blob/master/pkg/minikube/bootstrapper/bsutil/template/template.go#L80

make sure to change for all versions v1alpha, beta...

medyagh · 2020-01-08T18:27:33Z

cmd/minikube/cmd/start.go

@@ -907,6 +907,17 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": repository})
 	}

+	var kubeNodeName string
+	if drvName == driver.None {


Is there any reason that the none driver should not have the same node name as Profile name ?
I would rather we treat all drivers same way as much as possible.

so lets have the profile name for none driver unless there is a good reason for it that I dont know ?

In the none driver the host is created by the user not minikube. If we're not setting the default host name, it will result a different node name with the host.
This issue would not exist for other drivers as those drivers create the VM and set the host name.
We may need to ask user to set the profile name to keep the same behavior as other drivers which may be confusing.

laozc · 2020-01-09T07:33:49Z

we also need to change the "clusterName: kubernetes" in the config template files
for example this one
https://github.com/kubernetes/minikube/blob/master/pkg/minikube/bootstrapper/bsutil/template/template.go#L80

make sure to change for all versions v1alpha, beta...

Let me work on it.

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

minikube-bot · 2020-01-09T12:22:26Z

All Times minikube: [ 122.312750 126.452668 128.741744]
All Times Minikube (PR 6200): [ 128.445923 125.514681 127.103730]

Average Minikube (PR 6200): 127.021444
Average minikube: 125.835720

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+-----------+--------------------+
| minikube v           |  0.517005 |           0.517984 |
| Creating kvm2        | 47.714099 |          47.615632 |
| Preparing Kubernetes | 50.474336 |          51.585890 |
| Pulling images       |  3.125711 |           3.069604 |
| Launching Kubernetes | 21.145112 |          21.102278 |
| Waiting for cluster  |  2.809713 |           3.080203 |
| Done                 |           |                    |
|                      |  0.049744 |           0.047879 |
+----------------------+-----------+--------------------+

minikube-pr-bot · 2020-01-17T20:03:32Z

All Times minikube: [ 230.471049 231.896780 255.411575]
All Times Minikube (PR 6200): [ 133.603658 131.999431 129.485016]

Average minikube: 239.259802
Average Minikube (PR 6200): 131.696035

Averages Time Per Log

+----------------------+------------+--------------------+
|         LOG          |  MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+------------+--------------------+
| minikube v           |   0.330490 |           0.490987 |
| Creating kvm2        | 165.055304 |          49.438031 |
| Preparing Kubernetes |  42.719826 |          52.327345 |
| Pulling images       |   3.093997 |           2.861671 |
| Launching Kubernetes |  25.124011 |          21.960791 |
| Waiting for cluster  |   2.408452 |           2.589912 |
+----------------------+------------+--------------------+

minikube-pr-bot · 2020-01-22T20:55:42Z

All Times minikube: [ 115.674457 114.736020 113.975103]
All Times Minikube (PR 6200): [ 246.228137 244.239141 223.489306]

Average minikube: 114.795194
Average Minikube (PR 6200): 237.985528

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+-----------+--------------------+
| minikube v           |  0.293279 |           0.295391 |
| Creating kvm2        | 41.204637 |         160.882943 |
| Preparing Kubernetes | 47.127649 |          41.354905 |
| Pulling images       |  3.579486 |           2.528940 |
| Launching Kubernetes | 19.648309 |          30.318637 |
| Waiting for cluster  |  2.888949 |           2.554120 |
+----------------------+-----------+--------------------+

medyagh · 2020-02-02T05:53:24Z

/retest-this-please

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

minikube-pr-bot · 2020-02-03T11:43:13Z

All Times minikube: [ 96.419035 97.156901 95.234201]
All Times Minikube (PR 6200): [ 248.164132 249.146323 230.991058]

Average minikube: 96.270046
Average Minikube (PR 6200): 242.767171

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+-----------+--------------------+
| minikube v           |  0.312811 |           0.289210 |
| Creating kvm2        | 19.591671 |         160.905856 |
| Preparing Kubernetes | 49.344328 |          42.566592 |
| Pulling images       |  3.671491 |           2.145264 |
| Launching Kubernetes | 20.317207 |          32.102551 |
| Waiting for cluster  |  1.065767 |           2.725942 |
+----------------------+-----------+--------------------+

minikube-pr-bot · 2020-02-03T14:55:38Z

All Times minikube: [ 95.112039 96.441117 99.449515]
All Times Minikube (PR 6200): [ 95.511743 100.262568 97.791517]

Average Minikube (PR 6200): 97.855276
Average minikube: 97.000891

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6200) |
+----------------------+-----------+--------------------+
| minikube v           |  0.318202 |           0.314049 |
| Creating kvm2        | 20.270194 |          20.131254 |
| Preparing Kubernetes | 49.847239 |          50.782450 |
| Pulling images       |  3.196627 |           2.979757 |
| Launching Kubernetes | 19.858326 |          20.594995 |
| Waiting for cluster  |  1.387860 |           1.060559 |
+----------------------+-----------+--------------------+

laozc added 3 commits January 1, 2020 13:45

Allow user to override node name

f9ed4a6

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

Set node name in non-default profile

914c34c

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

Set node name the same as host name by default for none driver

73608d6

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 3, 2020

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 3, 2020

k8s-ci-robot requested review from josedonizetti and RA489 January 3, 2020 09:43

medyagh requested changes Jan 7, 2020

View reviewed changes

cmd/minikube/cmd/start.go Outdated Show resolved Hide resolved

cmd/minikube/cmd/start.go Outdated Show resolved Hide resolved

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 Jan 8, 2020

laozc added 2 commits January 8, 2020 14:42

Use profile name as the node name

d3ff888

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

Merge remote-tracking branch 'origin/master' into node-name

96398c7

Remove unused var

be7b527

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

laozc changed the title ~~Allow user to specify node name~~ Use profile name as node name Jan 8, 2020

medyagh requested changes Jan 8, 2020

View reviewed changes

medyagh changed the title ~~Use profile name as node name~~ Use profile name as cluster/node name Jan 8, 2020

medyagh changed the title ~~Use profile name as cluster/node name~~ wip: Use profile name as cluster/node name Jan 8, 2020

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 8, 2020

laozc added 2 commits January 9, 2020 19:52

Do not set host-override for kubelet by default

0512882

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

Adds cluster name to kubenetes config

4a1f33e

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

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

Merge remote-tracking branch 'origin' into node-name

6b0c699

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

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

Merge remote-tracking branch 'origin/master' into node-name

f59a289

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

laozc changed the title ~~wip: Use profile name as cluster/node name~~ Use profile name as cluster/node name Feb 3, 2020

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 3, 2020

Fixes merge issue

c6340c7

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>

Handle node info in kubelet config

fc85dd6

sharifelgamal merged commit 6d59d9d into kubernetes:master Feb 5, 2020

vpnachev mentioned this pull request Mar 23, 2020

Unable to override node-name: lookup minikube on x:53: no such host #7161

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use profile name as cluster/node name #6200

Use profile name as cluster/node name #6200

laozc commented Jan 3, 2020

minikube-bot commented Jan 3, 2020

k8s-ci-robot commented Jan 3, 2020

k8s-ci-robot commented Jan 3, 2020

codecov-io commented Jan 3, 2020 •

edited

Loading

medyagh left a comment

RA489 commented Jan 8, 2020

minikube-bot commented Jan 8, 2020

minikube-bot commented Jan 8, 2020

medyagh left a comment

medyagh Jan 8, 2020

laozc Jan 9, 2020

laozc commented Jan 9, 2020

minikube-bot commented Jan 9, 2020

minikube-pr-bot commented Jan 17, 2020

minikube-pr-bot commented Jan 22, 2020

medyagh commented Feb 2, 2020

minikube-pr-bot commented Feb 3, 2020

minikube-pr-bot commented Feb 3, 2020

Use profile name as cluster/node name #6200

Use profile name as cluster/node name #6200

Conversation

laozc commented Jan 3, 2020

minikube-bot commented Jan 3, 2020

k8s-ci-robot commented Jan 3, 2020

k8s-ci-robot commented Jan 3, 2020

codecov-io commented Jan 3, 2020 • edited Loading

Codecov Report

medyagh left a comment

Choose a reason for hiding this comment

RA489 commented Jan 8, 2020

minikube-bot commented Jan 8, 2020

minikube-bot commented Jan 8, 2020

medyagh left a comment

Choose a reason for hiding this comment

medyagh Jan 8, 2020

Choose a reason for hiding this comment

laozc Jan 9, 2020

Choose a reason for hiding this comment

laozc commented Jan 9, 2020

minikube-bot commented Jan 9, 2020

minikube-pr-bot commented Jan 17, 2020

minikube-pr-bot commented Jan 22, 2020

medyagh commented Feb 2, 2020

minikube-pr-bot commented Feb 3, 2020

minikube-pr-bot commented Feb 3, 2020

codecov-io commented Jan 3, 2020 •

edited

Loading