8000 Unset the current-context after minikube stop by hpandeycodeit · Pull Request #4177 · kubernetes/minikube · GitHub
[go: up one dir, main page]

Skip to content

Unset the current-context after minikube stop - #4177

Merged
tstromberg merged 9 commits into
kubernetes:masterfrom
hpandeycodeit:master
May 15, 2019
Merged

tstromberg merged 9 commits into
kubernetes:masterfrom
hpandeycodeit:master

Conversation

@hpandeycodeit
Copy link
Copy Markdown

This PR implements Feature Request #4154

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

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

Details

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 k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 30, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hpandeycodeit
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: jimmidyson

If they are not already assigned, you can assign the PR to them by writing /assign @jimmidyson in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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
Copy Markdown
Collaborator

Can one of the admins verify this patch?

@tstromberg
Copy link
Copy Markdown
Contributor

@minikube-bot OK to test

@tstromberg tstromberg left a comment
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks great, and will be a really nice improvement for users, particularly those who show their kubectl context in their shells. This PR looks like it does exactly what it should be doing.

To guard against breaking this in the future, do you mind adding a few lines to start_stop_delete_test.go to verify the behavior? For example, before you call stop, assert that there is a context, and that it goes away after stop. Something like:

`k = util.NewKubeCtlRunner()
got := k.RunCommand("config", "current-context")
if got != "minikube" { fail }


and after stop:

got := k.RunCommand("config", "current-context")
if got != "" { fail }


Thank you again for your contribution!

Comment thread pkg/util/kubeconfig.go Outdated
// Only set current context to minikube if the user has not used the keepContext flag
if !cfg.KeepContext {
kubecfg.CurrentContext = cfg.ClusterName
//kubecfg.CurrentContext = ""
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Remove?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

done

Comment thread pkg/util/kubeconfig.go Outdated
}

//UnsetCurrentContext unsets the current-context from minikube to "" on minikube stop
func UnsetCurrentContext(filename, machineName string) error {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please run gofmt -s -w on this file to reformat it to Go standards. Consider configuring your code editor to do this on save.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

formatted this one.

@k8s-ci-robot 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 Apr 30, 2019
@hpandeycodeit
Copy link
Copy Markdown
Author

@tstromberg I have included the tests. Let me know if it looks okay. Thanks for the pointer :)

@tstromberg
tstromberg commented Apr 30, 2019 •
Copy link
Copy Markdown
Contributor

Looks great, but you'll need to do a tiny bit more work to plumb the runner through correctly:

test/integration/start_stop_delete_test.go:81:4: undefined: kubeRunner
test/integration/start_stop_delete_test.go:81:17: undefined: "k8s.io/minikube/test/integration/util".NewKubeCtlRunner
test/integration/start_stop_delete_test.go:82:4: undefined: currentContext
test/integration/start_stop_delete_test.go:82:21: undefined: kubeRunner
test/integration/start_stop_delete_test.go:83:7: undefined: currentContext
test/integration/start_stop_delete_test.go:92:4: undefined: currentContext
test/integration/start_stop_delete_test.go:92:21: undefined: kubeRunner
test/integration/start_stop_delete_test.go:93:7: undefined: currentContext

Also, please run gofmt -s -w on the files you changed (cmd/minikube/cmd/stop.go in particular) so that they are formatted with the recommended Go style. FYI, you can run the integration tests locally by using something like:

make test
env TEST_ARGS="-minikube-start-args=--vm-driver=kvm2 -test.run TestStartStop" make integration

@hpandeycodeit
Copy link
Copy Markdown
Author

@tstromberg Fixed the gofmt errors. Integration tests passed as well. Hopefully it should be fine this time.

@RA489
RA489 commented May 2, 2019
Copy link
Copy Markdown

@minikube-bot OK to test

@tstromberg
Copy link
Copy Markdown
Contributor

@minikube-bot OK to test

@tstromberg
Copy link
Copy Markdown
Contributor

Tests are failing:

--- FAIL: TestStartStop (812.27s)
    --- FAIL: TestStartStop/nocache_oldest (166.82s)
        start_stop_delete_test.go:87: current-context not set to minikube
    --- FAIL: TestStartStop/feature_gates_newest_cni (199.59s)
        start_stop_delete_test.go:87: current-context not set to minikube
    --- FAIL: TestStartStop/containerd_and_non_default_apiserver_port (224.69s)
        start_stop_delete_test.go:87: current-context not set to minikube
    --- FAIL: TestStartStop/crio_ignore_preflights (221.17s)
        start_stop_delete_test.go:87: current-context not set to minikube

@tstromberg
Copy link
Copy Markdown
Contributor

It might help here if the test showed the error in got vs want syntax, such as:

got context %q, want context %q

@hpandeycodeit
Copy link
Copy Markdown
Author

@tstromberg I have changed it. Not sure why the context is different. Not getting this error in my local though.

@hpandeycodeit
hpandeycodeit commented May 3, 2019 •
Copy link
Copy Markdown
Author

@tstromberg thanks for approving the changes!

Above failing tests still showing a failure in current-context mismatch.

--- FAIL: TestStartStop (826.16s) --- FAIL: TestStartStop/nocache_oldest (179.80s) start_stop_delete_test.go:87: got current-context - "minikube\n", want current-context "minikube" --- FAIL: TestStartStop/feature_gates_newest_cni (203.97s) start_stop_delete_test.go:87: got current-context - "minikube\n", want current-context "minikube" --- FAIL: TestStartStop/containerd_and_non_default_apiserver_port (222.13s) start_stop_delete_test.go:87: got current-context - "minikube\n", want current-context "minikube" --- FAIL: TestStartStop/crio_ignore_preflights (220.26s) start_stop_delete_test.go:87: got current-context - "minikube\n", want current-context "minikube" === RUN TestVersionUpgrade

not sure from where it's getting "minikube\n"

Any Idea?

@tstromberg
Copy link
Copy Markdown
Contributor
--- FAIL: TestStartStop (947.48s)
    --- FAIL: TestStartStop/nocache_oldest (210.63s)
        start_stop_delete_test.go:87: got current-context - "minikube\n", want  current-context "minikube"
    --- FAIL: TestStartStop/feature_gates_newest_cni (223.77s)
        start_stop_delete_test.go:87: got current-context - "minikube\n", want  current-context "minikube"
    --- FAIL: TestStartStop/containerd_and_non_default_apiserver_port (252.40s)
        start_stop_delete_test.go:87: got current-context - "minikube\n", want  current-context "minikube"
    --- FAIL: TestStartStop/crio_ignore_preflights (260.68s)

You may want to call strings.TrimRight() before comparing the value.

@tstromberg
tstromberg commented May 6, 2019 •
Copy link
Copy Markdown
Contributor

Looks like it's getting better, but something is still not quite right:

--- FAIL: TestStartStop (857.56s)
    --- FAIL: TestStartStop/nocache_oldest (186.06s)
        start_stop_delete_test.go:100: Failed to unset the current-context "minikube\n"
    --- FAIL: TestStartStop/feature_gates_newest_cni (206.81s)
        start_stop_delete_test.go:100: Failed to unset the current-context "minikube\n"
    --- FAIL: TestStartStop/containerd_and_non_default_apiserver_port (238.16s)
        start_stop_delete_test.go:100: Failed to unset the current-context "minikube\n"
    --- FAIL: TestStartStop/crio_ignore_preflights (226.53s)
        start_stop_delete_test.go:100: Failed to unset the current-context "minikube\n"

Does running env TEST_ARGS="-test.run TestStartStop" make integration work for you?

@hpandeycodeit
Copy link
Copy Markdown
Author

@tstromberg I am able to test this in my local and it's failing as well. So the issue here is, if I put this code right below the stop, since the minikube takes time to stop and the code still retrieves current-context as "minikube":

checkStop := func() error {
	r.RunCommand("stop", true)
	return r.CheckStatusNoFail(state.Stopped.String())
}

currentContext, err = kubectlRunner.RunCommand([]string{"config", "current-context"})
if strings.TrimRight(string(currentContext), "\n") != "" {
	t.Fatalf("Failed to unset the current-context %q", strings.TrimRight(string(currentContext), "\n"))
}

if err := util.Retry(t, checkStop, 5*time.Second, 6); err != nil {
	t.Fatalf("timed out while checking stopped status: %v", err)
}


However if I put this code after the code that checks stopped status, minikube is stopped then but there is no context and then it throws error something like this

util.go:295: Temporary Error: error running command [config current-context]: exit status 1. Stdout:
error: current-context is not set

So looks like I can't really compare the current-context with an empty string here ""

@hpandeycodeit
Copy link
Copy Markdown
Author

@tstromberg let me know if this looks okay to you or any other change is needed to the test.

@tstromberg
Copy link
Copy Markdown
Contributor

Looks good. Thank you!

@tstromberg
tstromberg merged commit c55b916 into kubernetes:master May 15, 2019
@hpandeycodeit
Copy link
Copy Markdown
Author

Thank you @tstromberg!

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. needs-ok-to-test Indicates a PR that requires an org member to verify it 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.

5 participants

0