Added update-context and kubeconfig to status #1578

abbytiz · 2017-06-12T21:10:41Z

No description provided.

minikube-bot · 2017-06-12T21:11:02Z

Can one of the admins verify this patch?

r2d4 · 2017-06-12T21:14:40Z

@minikube-bot OK to test

I also added your account to the whitelist, so tests should run on all of your PRs automatically

codecov-io · 2017-06-12T21:30:16Z

Codecov Report

Merging #1578 into master will decrease coverage by 0.44%.
The diff coverage is 23.25%.

@@            Coverage Diff             @@
##           master    #1578      +/-   ##
==========================================
- Coverage   39.52%   39.08%   -0.45%     
==========================================
  Files          50       51       +1     
  Lines        2548     2633      +85     
==========================================
+ Hits         1007     1029      +22     
- Misses       1375     1428      +53     
- Partials      166      176      +10

Impacted Files	Coverage Δ
pkg/minikube/cluster/cluster.go	`44.44% <0%> (-1.52%)`	⬇️
cmd/minikube/cmd/status.go	`11.36% <0%> (-5.31%)`	⬇️
cmd/minikube/cmd/update-context.go	`10% <10%> (ø)`
pkg/minikube/kubeconfig/config.go	`53.33% <45%> (-2.06%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2ab1566...5778163. Read the comment docs.

r2d4

Cool! Everyone else got to review already so I added a few comments. Looks good though

r2d4 · 2017-06-12T21:19:18Z

cmd/minikube/cmd/update-context.go

+	Long: `Retrieves the IP address of the running cluster, checks it
+			with IP in kubeconfig, and corrects kubeconfig if incorrect.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		api, err := machine.NewAPIClient(clientType)


Once #1544 is merged, this will become machine.NewAPIClient()

r2d4 · 2017-06-12T21:55:45Z

pkg/minikube/kubeconfig/config.go

+	if kip.Equal(ip) {
+		return "Correctly Configured: pointing to minikube-vm at " + kip.String(), nil
+	}
+	return "Misconfigured: pointing to stale minikube-vm at " + kip.String() +


For GetKubeConfigStatus and UpdateKubeconfigIP I don't think we should be returning a user-facing string here.

For GetKubeConfigStatus, you might want to make this return a CheckKubeConfigStatus(ip, filename) error and then move these printed strings further up the stack into the command.

r2d4 · 2017-06-12T21:57:45Z

pkg/minikube/kubeconfig/config.go

+}
+
+// UpdateKubeconfigIP overwrites the IP stored in kubeconfig with the provided IP.
+func UpdateKubeconfigIP(ip net.IP, filename string) (string, error) {


For this function, you might want to change the signature to be func UpdateKubeconfigIP(ip, filename) (bool, error) where bool signifies whether or not the kubeconfig was rewritten. And similarly move the printed strings further up the stack in the command.

r2d4 · 2017-06-12T22:01:23Z

pkg/minikube/kubeconfig/config.go

+	if err != nil {
+		return "", errors.Wrap(err, "Error getting kubeconfig status")
+	}
+	con.Clusters["minikube"].Server = "https://" + ip.String() + ":" + strconv.Itoa(constants.APIServerPort)


Maybe a comment here on why this lookup is safe (since getIPFromKubeConfig ensures that the entry exists)?

r2d4 · 2017-06-12T22:03:31Z

pkg/minikube/kubeconfig/config_test.go

+			description: "no minikube cluster",
+			ip:          net.ParseIP("192.168.10.100"),
+			existing:    fakeKubeCfg,
+			status:      "Kubeconfig does not have a record of a minikube cluster",


Once you change the statuses to not be hardcoded strings then these checks will be much cleaner and robust. You'll lose some of the specificity of why the error occurred, but I think thats ok since it should be clear from the test.

r2d4 · 2017-06-12T22:07:11Z

pkg/minikube/kubeconfig/config.go

+}
+
+// getIPFromKubeConfig returns the IP address stored for minikube in the kubeconfig specified
+func getIPFromKubeConfig(filename string) (net.IP, error) {


@aaron-prindle does this need to be parameterized with machine name instead of minikube for the --profile flag?

Yes. @abbytiz minikube allows for multiple machines to be named. The name 'minikube' is the default but it can hold any value. You can test that your code is working with this by launching minikube using 'minikube start --profile test'. This will spin up a second copy of minikube with its own name and kubeconfig using that name.

r2d4 · 2017-06-12T22:11:07Z

pkg/minikube/cluster/cluster.go

@@ -165,6 +165,24 @@ func GetLocalkubeStatus(api libmachine.API) (string, error) {
 	}
 }

+// GetHostDriverIP gets the ip address of the current minikube cluster
+func GetHostDriverIP(api libmachine.API) (net.IP, error) {


Nice, I can't believe we didn't have something like this before. Out of scope for this PR, but we might want to consider moving some of our other functions that just call Driver.GetIP() directly to use this, so we can pass around a real net.IP struct.

aaron-prindle · 2017-06-12T22:19:11Z

pkg/minikube/kubeconfig/config.go

+	if err != nil {
+		return "", errors.Wrap(err, "Error getting kubeconfig status")
+	}
+	con.Clusters["minikube"].Server = "https://" + ip.String() + ":" + strconv.Itoa(constants.APIServerPort)


I don't think it is safe to use a hardcoded 'minikube' here. The value here comes from the machineName. You can see how the kubeconfig is created in start.go using the machineName here: https://github.com/kubernetes/minikube/blob/master/cmd/minikube/cmd/start.go#L192

aaron-prindle · 2017-06-13T21:02:50Z

@minikube-bot retest this please

aaron-prindle · 2017-06-13T23:04:25Z

This works great locally. Just squash this down into a singe commit and then we can get it merged. Nice job!

aaron-prindle · 2017-06-14T17:45:19Z

LGTM, merging. Perhaps as an additional PR we can have update-context set the kubectl context to use minikube as doing so through kubectl seems to trip up some users.

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 12, 2017

r2d4 reviewed Jun 12, 2017

View reviewed changes

aaron-prindle reviewed Jun 12, 2017

View reviewed changes

abbytiz force-pushed the update-context branch from d4faeea to 190bad4 Compare June 13, 2017 18:20

abbytiz force-pushed the update-context branch from 451377e to ae26f75 Compare June 13, 2017 21:25

Added update-context and kubeconfig to status.

5778163

abbytiz force-pushed the update-context branch from ae26f75 to 5778163 Compare June 13, 2017 23:23

aaron-prindle approved these changes Jun 14, 2017

View reviewed changes

aaron-prindle merged commit e524e8a into kubernetes:master Jun 14, 2017

This was referenced Jun 14, 2017

Correct NewAPIClient invocation #1586

Merged

kubectl status output in minikube status #1559

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added update-context and kubeconfig to status #1578

Added update-context and kubeconfig to status #1578

abbytiz commented Jun 12, 2017

minikube-bot commented Jun 12, 2017

r2d4 commented Jun 12, 2017

codecov-io commented Jun 12, 2017 •

edited

Loading

r2d4 left a comment

r2d4 Jun 12, 2017

r2d4 Jun 12, 2017

r2d4 Jun 12, 2017

r2d4 Jun 12, 2017

r2d4 Jun 12, 2017

r2d4 Jun 12, 2017

aaron-prindle Jun 12, 2017

r2d4 Jun 12, 2017

aaron-prindle Jun 12, 2017

aaron-prindle commented Jun 13, 2017

aaron-prindle commented Jun 13, 2017

aaron-prindle commented Jun 14, 2017

Added update-context and kubeconfig to status #1578

Added update-context and kubeconfig to status #1578

Conversation

abbytiz commented Jun 12, 2017

minikube-bot commented Jun 12, 2017

r2d4 commented Jun 12, 2017

codecov-io commented Jun 12, 2017 • edited Loading

Codecov Report

r2d4 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aaron-prindle commented Jun 13, 2017

aaron-prindle commented Jun 13, 2017

aaron-prindle commented Jun 14, 2017

codecov-io commented Jun 12, 2017 •

edited

Loading