driver/daemonset: Align node selection behavior with Kubernetes scheduler #1958
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
Align node filter behavior with Kuberntes scheduler to avoid errors when both of nodeSelctor and nodeAffinity are set to PodSpec. > If you specify both nodeSelector and nodeAffinity, both must be satisfied for the Pod to be scheduled onto a node. > > https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/ Issue: vmware-tanzu#1957 Signed-off-by: nonylene <nonylene@gmail.com>
Align nodeAffinity matching behavior with Kubernetes schduler. > If you specify multiple expressions in a single matchExpressions field associated with a term in nodeSelectorTerms, then the Pod can be scheduled onto a node only if all the expressions are satisfied (expressions are ANDed). > > https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/ Close vmware-tanzu#1957 Signed-off-by: nonylene <nonylene@gmail.com>
nonylene
commented
Feb 5, 2024
| @@ -119,28 +119,30 @@ func (p *Plugin) filterByNodeSelector(nodes []v1.Node) []v1.Node { | |||
| } | |||
| ls = ls.Add(reqs...) | |||
|
|
|||
| if ls.Empty() && nodeSelector == nil { | |||
There was a problem hiding this comment.
This condition is now covered within the for loop below.
nonylene
commented
Feb 5, 2024
| expect: []plugin.ExpectedResult{ | ||
| {NodeName: "node1", ResultType: "myPlugin"}, | ||
| {NodeName: "node2", ResultType: "myPlugin"}, | ||
| {NodeName: "node4", ResultType: "myPlugin"}, | ||
| }, | ||
| p: pluginWithAffinity([]corev1.NodeSelectorRequirement{ | ||
| {Key: "foo", Operator: corev1.NodeSelectorOpNotIn, Values: []string{"bar", "baz"}}, | ||
| {Key: "foo", Operator: corev1.NodeSelectorOpIn, Values: []string{"bar"}}, |
There was a problem hiding this comment.
This test case was inconsistent with the behavior of Kubernetes scheduler (fixed)
nonylene
commented
Feb 5, 2024
| {Key: "foo", Operator: corev1.NodeSelectorOpExists}, | ||
| }), | ||
| }, { | ||
| desc: "Selector and Affinity: ANDed if both specified (negative affinity)", |
There was a problem hiding this comment.
I added this case since a case when positive in the selector and negative in the affinity is not tested in the last test
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:
Align node selection behavior with Kubernetes scheduler in DaemonSet driver.
Which issue(s) this PR fixes
Special notes for your reviewer:
Release note: