Bugfix: Drain machines with only a valid NodeName #480
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-3
added
needs/ok-to-test
prashanth26
force-pushed
the
bugfix/drain-nodeless-machine
branch
from
a5f18a5
to
2da2e4f
Compare
gardener-robot-ci-1
added
reviewed/ok-to-test
prashanth26
force-pushed
the
bugfix/drain-nodeless-machine
branch
from
2da2e4f
to
3484d7c
Compare
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
|
/kind regression |
|
@prashanth26 Command |
gardener-robot
added
priority/critical
hardikdr
reviewed
Jun 28, 2020
| @@ -599,7 +599,9 @@ func (c *controller) machineDelete(machine *v1alpha1.Machine, driver driver.Driv | |||
| } | |||
| } | |||
|
|
|||
| if machineID != "" { | |||
| if machineID != "" && nodeName != "" { | |||
| // Begin drain logic only when the nodeName & providerID exist's for the machine | |||
There was a problem hiding this comment.
Suggested change
| // Begin drain logic only when the nodeName & providerID exist's for the machine | |
| // Begin drain logic only when the nodeName & providerID exists for the machine |
There was a problem hiding this comment.
Do we need this change also in OOT?
hardikdr
reviewed
Jun 28, 2020
| @@ -599,7 +599,9 @@ func (c *controller) machineDelete(machine *v1alpha1.Machine, driver driver.Driv | |||
| } | |||
| } | |||
|
|
|||
| if machineID != "" { | |||
| if machineID != "" && nodeName != "" { | |||
| // Begin drain logic only when the nodeName & providerID exist's for the machine | |||
There was a problem hiding this comment.
Do we need this change also in OOT?
gardener-robot-ci-2
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
prashanth26
force-pushed
the
bugfix/drain-nodeless-machine
branch
from
893ee56
to
66fee5c
Compare
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-1
removed
the
reviewed/ok-to-test
Nice catch. Even I thought about it, although I think the OOT will not run into such a situation. I have added this check just to be safe. Here - 66fee5c Also if all looks good, please squash and merge it. Thanks. |
gardener-robot-ci-1
added
the
reviewed/ok-to-test
|
Hi @ggaurav10 , Nice catch with this. Made the suggested change here - 0a7d3b5 |
gardener-robot-ci-1
removed
the
reviewed/ok-to-test
prashanth26
force-pushed
the
bugfix/drain-nodeless-machine
branch
from
0a7d3b5
to
b2ea619
Compare
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
ggaurav10
approved these changes
Jun 30, 2020
|
/lgtm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #465
Special notes for your reviewer:
Release note: