improve the isdraning check for openshift #419
Merged
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
there is a case where we annotate the node as draning because we took the leader but on OCP the machine config pool was doing some work so we wait for it. if in the specific stage that we wait for the MCP we reset the daemon the new pod will say that it doesn't need to pause the pool and just start a drain and we will stuck the cluster if we have some PDB blocking for more then 1 node to drain Signed-off-by: Sebastian Sch <sebassch@gmail.com>
|
Thanks for your PR,
To skip the vendors CIs use one of:
|
Pull Request Test Coverage Report for Build 4428919985
💛 - Coveralls |
| @@ -580,6 +580,14 @@ func (dn *Daemon) nodeHasAnnotation(annoKey string, value string) bool { | |||
|
|
|||
| func (dn *Daemon) isNodeDraining() bool { | |||
| if anno, ok := dn.node.Annotations[annoKey]; ok && (anno == annoDraining || anno == annoMcpPaused) { | |||
| // for openshift cluster draining should be true only if the annotation has MCP paused | |||
| if dn.openshiftContext.IsOpenshiftCluster() && !dn.openshiftContext.IsHypershift() { | |||
| if anno == annoMcpPaused { | |||
There was a problem hiding this comment.
I dont know how MCP Pause annot is being used so i cannot comment on the correctess of this and how it would affect all palces which call this method
but some comment about the style :)
you can check for annoDraining and drop the else.
There was a problem hiding this comment.
Hi @adrianchiris, I addressed your comment about style in:
I also added some unit tests to be sure we do not forget any use cases.
Can you please refer to that PR?
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.
there is a case where we annotate the node as draning because we took the leader but on OCP the machine config pool was doing some work so we wait for it. if in the specific stage that we wait for the MCP we reset the daemon the new pod will say that it doesn't need to pause the pool and just start a drain
and we will stuck the cluster if we have some PDB blocking for more then 1 node to drain