fix: implements the nodeSelector check #133
Conversation
openshift-ci
bot
added
the
approved
| //TODO: actually check the node against the nodeSelector. | ||
| node := &corev1.Node{} | ||
| nodeMatches, err := NodeSelectorMatchesNodeLabels(node, volumeGroup.Spec.NodeSelector) | ||
| //Does this node need to process it? |
There was a problem hiding this comment.
can you elaborate a bit more?
There was a problem hiding this comment.
If the nodeSelector for the VG does not match the node the vgmanager is running on, it does not need to do anything.
There was a problem hiding this comment.
ok. The comment is framed as a question. Should it rather be a statement.
| return false, err | ||
| } | ||
|
|
||
| if !nodeMatches { |
There was a problem hiding this comment.
This check might not be needed. Function can return nodeMatches variable.
| if err != nil { | ||
| return false, err | ||
| } | ||
| nodeMatches, err := NodeSelectorMatchesNodeLabels(node, selector) |
There was a problem hiding this comment.
maybe just do
return NodeSelectorMatchesNodeLabels(node, selector)
| @@ -381,3 +382,14 @@ func (r *VGReconciler) getNewNodeStatus(status *lvmv1alpha1.VGStatus) *lvmv1alph | |||
| setStatus(status, vgNodeStatus) | |||
| return vgNodeStatus | |||
| } | |||
|
|
|||
| func (r *VGReconciler) matchesMyNode(ctx context.Context, selector *corev1.NodeSelector) (bool, error) { | |||
There was a problem hiding this comment.
need a better name than matchesMynode.
There was a problem hiding this comment.
matchesNode. But I also agree with Leela's comment that we can remove this function.
There was a problem hiding this comment.
I disagree - functions provide readability.
| @@ -381,3 +382,14 @@ func (r *VGReconciler) getNewNodeStatus(status *lvmv1alpha1.VGStatus) *lvmv1alph | |||
| setStatus(status, vgNodeStatus) | |||
| return vgNodeStatus | |||
| } | |||
|
|
|||
| func (r *VGReconciler) matchesMyNode(ctx context.Context, selector *corev1.NodeSelector) (bool, error) { | |||
There was a problem hiding this comment.
- maybe we'll not be using this function again and considering it's quite small, how about in-lining it in the call site itself?
There was a problem hiding this comment.
I think that is best left to the compiler.
There was a problem hiding this comment.
I also agree with Leela here. We can remove the matchesMyNode function.
There was a problem hiding this comment.
I prefer having functions for readability.
This commit implements the nodeSelector check in vgmanager. Signed-off-by: N Balachandran <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: leelavg, nbalacha 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:
Approvers can indicate their approval by writing |
This commit implements the nodeSelector check in
vgmanager.
Signed-off-by: N Balachandran [email protected]