Fix profile list when there are multi node clusters #9996

daehyeok · 2020-12-18T01:42:19Z

Fix problem which ListProfiles return sub-nodes in Mult-Node clusters as
a part of inValidPs.

before

❯ minikube profile list
|----------|-----------|---------|--------------|------|---------|---------|-------|
| Profile  | VM Driver | Runtime |      IP      | Port | Version | Status  | Nodes |
|----------|-----------|---------|--------------|------|---------|---------|-------|
| minikube | docker    | docker  | 192.168.49.2 | 8443 | v1.20.0 | Running |     2 |
|----------|-----------|---------|--------------|------|---------|---------|-------|
❗  Found 1 invalid profile(s) !
	 minikube-m02
💡  You can delete them using the following command(s):
	 $ minikube delete -p minikube-m02

after

❯ minikube profile list
|----------|-----------|---------|--------------|------|---------|---------|-------|
| Profile  | VM Driver | Runtime |      IP      | Port | Version | Status  | Nodes |
|----------|-----------|---------|--------------|------|---------|---------|-------|
| minikube | docker    | docker  | 192.168.49.2 | 8443 | v1.20.0 | Running |     2 |
|----------|-----------|---------|--------------|------|---------|---------|-------|
❗  Found 0 invalid profile(s) !
💡  You can delete them using the following command(s):

k8s-ci-robot · 2020-12-18T01:42:27Z

Hi @daehyeok. 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.

minikube-bot · 2020-12-18T01:48:03Z

Can one of the admins verify this patch?

medyagh · 2020-12-23T00:21:04Z

pkg/minikube/config/profile.go

@@ -242,6 +250,27 @@ func removeDupes(profiles []string) []string {
 	return result
 }

+// TODO: MachineName is copied from driver to avoid dependency cycle. Remove it or move to other module
+// MachineName returns the name of the machine, as seen by the hypervisor given the cluster and node names
+func MachineName(cc *ClusterConfig, n *Node) string {


lets move this a package that everyone can use, and we could refactor all other existances of this function
this could be moved to maybe util package or drivers package

Which package is good for new home of this func?

does it allow to put it in 'drivers" package ?

or can we put it in the machine package?
so we could call it something like this

machine.NameFromConfig(cc *ClusterConfig, n *Node)

or simply

machine.Name(cc *ClusterConfig, n *Node)

Are you means pkg/minikube/machine package?
Unfortunately, it also depend on config.

how about we refactor the MachineName func to not depend on clusterConfig or Node ?

so we pass everything we want from it ?

machine.Name(name string, int nodes, controlPlane bool, ...)

Function required following arguments,
Cluster name, Node name, number of node in cluster, is controlPlane or not
machine.Name(clusterName, nodeName string, int nodes, controlPlane bool).
Is it okay?

@daehyeok sure that sounds like a good compromise

pkg/minikube/config/profile.go

medyagh · 2020-12-31T06:26:30Z

pkg/minikube/config/profile.go

@@ -242,6 +250,27 @@ func removeDupes(profiles []string) []string {
 	return result
 }

+// TODO: MachineName is copied from driver to avoid dependency cycle. Remove it or move to other module
+// MachineName returns the name of the machine, as seen by the hypervisor given the cluster and node names
+func MachineName(cc *ClusterConfig, n *Node) string {


or can we put it in the machine package?
so we could call it something like this

machine.NameFromConfig(cc *ClusterConfig, n *Node)

or simply

machine.Name(cc *ClusterConfig, n *Node)

tstromberg · 2021-01-06T19:20:05Z

Any update here? I wonder if @medyagh 's suggestion will also result in a circular dependency.

medyagh · 2021-01-06T23:19:26Z

pkg/minikube/config/profile.go

@@ -242,6 +250,27 @@ func removeDupes(profiles []string) []string {
 	return result
 }

+// TODO: MachineName is copied from driver to avoid dependency cycle. Remove it or move to other module
+// MachineName returns the name of the machine, as seen by the hypervisor given the cluster and node names
+func MachineName(cc *ClusterConfig, n *Node) string {


how about we refactor the MachineName func to not depend on clusterConfig or Node ?

so we pass everything we want from it ?

machine.Name(name string, int nodes, controlPlane bool, ...)

medyagh

thanks for this PR
it looks good just one thing I request to add integation test for it.

we have a TestMultiNode https://github.com/medyagh/minikube/blob/89a8cdc794098f9ba0550fbb5eeb19bc3dd8774d/test/integration/multinode_test.go#L29
lets add a Profile List to that test
and ensure the Profile List Exits Normally
only check for exit code 0

		}{
			{"FreshStart2Nodes", validateMultiNodeStart},
			{"AddNode", validateAddNodeToMultiNode},
			{"StopNode", validateStopRunningNode},
			{"StartAfterStop", validateStartNodeAfterStop},
			{"DeleteNode", validateDeleteNodeFromMultiNode},
			{"StopMultiNode", validateStopMultiNodeCluster},
			{"RestartMultiNode", validateRestartMultiNodeCluster},

lets add profile list after "FreshStart2Nodes",

daehyeok · 2021-01-17T05:16:50Z

Test added case to integration test.

sharifelgamal · 2021-01-20T19:32:10Z

Can we be sure that we don't show the "Found 0 invalid profiles" when there are no invalid profiles? When everything is ok, it should just show the table.

daehyeok · 2021-01-20T22:52:46Z

Can we be sure that we don't show the "Found 0 invalid profiles" when there are no invalid profiles? When everything is ok, it should just show the table.

Oops my bad. I confused master brach also print warn. Please ignore my previous comment.

fixed it.

❯ minikube profile list
|----------|-----------|---------|--------------|------|---------|---------|-------|
| Profile  | VM Driver | Runtime |      IP      | Port | Version | Status  | Nodes |
|----------|-----------|---------|--------------|------|---------|---------|-------|
| minikube | docker    | docker  | 192.168.49.2 | 8443 | v1.20.0 | Stopped |     1 |
|----------|-----------|---------|--------------|------|---------|---------|-------|

Fix prolbem which ListProfiles return subnodes in Mult-Node clusters as a part of inValidPs.

sharifelgamal · 2021-02-01T19:29:45Z

/ok-to-test

k8s-ci-robot · 2021-02-02T23:18:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: daehyeok, 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~~ [medyagh]

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 added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 18, 2020

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 Dec 18, 2020

k8s-ci-robot requested review from prasadkatti and priyawadhwa December 18, 2020 01:42

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 18, 2020

medyagh requested changes Dec 23, 2020

View reviewed changes

pkg/minikube/config/profile.go Show resolved Hide resolved

medyagh requested changes Dec 23, 2020

View reviewed changes

pkg/minikube/config/profile.go Show resolved Hide resolved

medyagh requested changes Dec 31, 2020

View reviewed changes

medyagh mentioned this pull request Jan 6, 2021

node list command not print all nodes. #10069

Closed

medyagh requested changes Jan 6, 2021

View reviewed changes

daehyeok mentioned this pull request Jan 8, 2021

refactor: migrate MachineName function to config package #10114

Merged

daehyeok force-pushed the profile_list_error branch from f2f74c5 to 12315d6 Compare January 9, 2021 20:36

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 9, 2021

daehyeok force-pushed the profile_list_error branch from 12315d6 to 97abedc Compare January 13, 2021 23:58

daehyeok requested a review from medyagh January 14, 2021 19:57

medyagh changed the title ~~Remove cluster's subnodes from ListProfiles result.~~ Fix profile list when there are multi node closers Jan 14, 2021

medyagh requested changes Jan 14, 2021

View reviewed changes

daehyeok force-pushed the profile_list_error branch from 97abedc to 2f059c7 Compare January 17, 2021 04:52

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 17, 2021

daehyeok force-pushed the profile_list_error branch from 2f059c7 to 772590c Compare January 17, 2021 05:03

daehyeok requested a review from medyagh January 17, 2021 05:16

daehyeok force-pushed the profile_list_error branch from 772590c to 9464507 Compare January 20, 2021 22:52

daehyeok force-pushed the profile_list_error branch from 9464507 to 362fc47 Compare January 26, 2021 18:16

Remove cluster's subnode from ListProfiles result.

5ddaf5f

Fix prolbem which ListProfiles return subnodes in Mult-Node clusters as a part of inValidPs.

daehyeok force-pushed the profile_list_error branch from 362fc47 to 5ddaf5f Compare January 28, 2021 22:44

sharifelgamal changed the title ~~Fix profile list when there are multi node closers~~ Fix profile list when there are multi node clusters Feb 1, 2021

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 Feb 1, 2021

medyagh approved these changes Feb 2, 2021

View reviewed changes

medyagh merged commit ce8a7e8 into kubernetes:master Feb 2, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix profile list when there are multi node clusters #9996

Fix profile list when there are multi node clusters #9996

daehyeok commented Dec 18, 2020 •

edited

Loading

k8s-ci-robot commented Dec 18, 2020

minikube-bot commented Dec 18, 2020

medyagh Dec 23, 2020 •

edited

Loading

daehyeok Dec 23, 2020

medyagh Dec 31, 2020

medyagh Dec 31, 2020 •

edited

Loading

daehyeok Jan 5, 2021

medyagh Jan 6, 2021

daehyeok Jan 6, 2021

medyagh Jan 7, 2021 •

edited

Loading

medyagh Dec 31, 2020 •

edited

Loading

tstromberg commented Jan 6, 2021

medyagh Jan 6, 2021

medyagh left a comment

daehyeok commented Jan 17, 2021

sharifelgamal commented Jan 20, 2021

daehyeok commented Jan 20, 2021

sharifelgamal commented Feb 1, 2021

k8s-ci-robot commented Feb 2, 2021

Fix profile list when there are multi node clusters #9996

Fix profile list when there are multi node clusters #9996

Conversation

daehyeok commented Dec 18, 2020 • edited Loading

k8s-ci-robot commented Dec 18, 2020

minikube-bot commented Dec 18, 2020

medyagh Dec 23, 2020 • edited Loading

Choose a reason for hiding this comment

daehyeok Dec 23, 2020

Choose a reason for hiding this comment

medyagh Dec 31, 2020

Choose a reason for hiding this comment

medyagh Dec 31, 2020 • edited Loading

Choose a reason for hiding this comment

daehyeok Jan 5, 2021

Choose a reason for hiding this comment

medyagh Jan 6, 2021

Choose a reason for hiding this comment

daehyeok Jan 6, 2021

Choose a reason for hiding this comment

medyagh Jan 7, 2021 • edited Loading

Choose a reason for hiding this comment

medyagh Dec 31, 2020 • edited Loading

Choose a reason for hiding this comment

tstromberg commented Jan 6, 2021

medyagh Jan 6, 2021

Choose a reason for hiding this comment

medyagh left a comment

Choose a reason for hiding this comment

daehyeok commented Jan 17, 2021

sharifelgamal commented Jan 20, 2021

daehyeok commented Jan 20, 2021

sharifelgamal commented Feb 1, 2021

k8s-ci-robot commented Feb 2, 2021

daehyeok commented Dec 18, 2020 •

edited

Loading

medyagh Dec 23, 2020 •

edited

Loading

medyagh Dec 31, 2020 •

edited

Loading

medyagh Jan 7, 2021 •

edited

Loading

medyagh Dec 31, 2020 •

edited

Loading