Supported nodeSelector.matchFields in scheduler. #62453

k82cn · 2018-04-12T09:20:27Z

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
part of #61410

Special notes for your reviewer:

Release note:

Supported nodeSelector.matchFields (node's `metadata.node`) in scheduler.

k82cn · 2018-04-24T06:44:25Z

/retest

k82cn · 2018-04-26T05:54:34Z

@kubernetes/sig-scheduling-pr-reviews

ravisantoshgudimetla · 2018-04-27T03:01:53Z

pkg/scheduler/algorithm/predicates/predicates.go

 	}
-	return false
+


nit: Remove blank line.

ravisantoshgudimetla

LGTM from scheduling side. I will wait for @bsalamat to comment as he has more context on this PR.

bsalamat · 2018-04-28T01:29:03Z

pkg/scheduler/algorithm/predicates/predicates_test.go

@@ -1387,11 +1388,66 @@ func TestPodFitsSelector(t *testing.T) {
 			fits: false,
 			test: "Pod with an invalid value in Affinity term won't be scheduled onto the node",
 		},
+		{


Could you please also add a test case with multiple selector terms? For example a case where there are multiple MatchExpressions and MatchFields terms?

bsalamat · 2018-04-28T01:31:07Z

pkg/scheduler/algorithm/types.go

@@ -25,6 +25,12 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/schedulercache"
 )

+// NodeFieldSelectorKeys is a map that: the key are node field selector keys; the value are


s/the value/the values/

bsalamat · 2018-04-28T01:31:50Z

pkg/scheduler/algorithm/predicates/predicates_test.go

+			},
+			nodeName: "node_2",
+			fits:     false,
+			test:     "Pod with matchFields using In operator that not matches the existing node",


s/not matches/does not match/

bsalamat · 2018-04-28T01:35:09Z

pkg/scheduler/algorithm/predicates/predicates.go

 }

 // The pod can only schedule onto nodes that satisfy requirements in both NodeAffinity and nodeSelector.
-func podMatchesNodeLabels(pod *v1.Pod, node *v1.Node) bool {
+func podMatchesNodeSelector(pod *v1.Pod, node *v1.Node) bool {


Please rename it to podMatchesNodeSelectorAndAffinityTerms to further distinguish it from the predicate function. Please update the comment and start it with the function name.

bsalamat · 2018-04-28T01:40:28Z

pkg/scheduler/algorithm/predicates/predicates.go

 }

 // The pod can only schedule onto nodes that satisfy requirements in both NodeAffinity and nodeSelector.
-func podMatchesNodeLabels(pod *v1.Pod, node *v1.Node) bool {
+func podMatchesNodeSelector(pod *v1.Pod, node *v1.Node) bool {
 	// Check if node.Labels match pod.Spec.NodeSelector.
 	if len(pod.Spec.NodeSelector) > 0 {
 		selector := labels.SelectorFromSet(pod.Spec.NodeSelector)


Should we call nodeMatchesNodeSelectorTerms and pass the NodeSelector terms of the pod? Am I missing something?

nodeMatchesNodeSelectorTerms only accept NodeSelectorTerm, but we can only get Selector here :(.

Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>

k82cn · 2018-05-09T01:20:50Z

@ravisantoshgudimetla , PTAL :)

ravisantoshgudimetla

Thanks @k82cn

ravisantoshgudimetla · 2018-05-09T04:32:33Z

/lgtm

k8s-ci-robot · 2018-05-09T04:33:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: k82cn, ravisantoshgudimetla

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:

~~pkg/scheduler/OWNERS~~ [k82cn]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k82cn · 2018-05-09T07:27:46Z

/retest

k8s-github-robot · 2018-05-09T08:46:36Z

/test all [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2018-05-09T09:47:20Z

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

janetkuo · 2018-05-14T19:39:19Z

pkg/scheduler/algorithm/well_known_labels.go

+
+	// NodeFieldSelectorKeyNodeName ('metadata.name') uses this as node field selector key
+	// when selecting node by node's name.
+	NodeFieldSelectorKeyNodeName = api.ObjectNameField


This is not a label, so should not be placed in well_known_labels.go.

k8s-github-robot added the kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API label Apr 12, 2018

k8s-ci-robot added the sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. label Apr 12, 2018

k8s-ci-robot requested review from caesarxuchao, davidopp, dchen1107, eparis, krousey, saad-ali and vishh April 12, 2018 09:20

k82cn force-pushed the k8s_61410_2 branch 4 times, most recently from b112be2 to b95db49 Compare April 17, 2018 01:38

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 17, 2018

k82cn mentioned this pull request Apr 19, 2018

Schedule DaemonSet Pods by default scheduler #59194

Closed

7 tasks

k82cn force-pushed the k8s_61410_2 branch from b95db49 to 0b1bc55 Compare April 24, 2018 06:05

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 24, 2018

k8s-github-robot removed the kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API label Apr 24, 2018

k82cn changed the title ~~WIP: Supported nodeSelector.matchFields in scheduler.~~ Supported nodeSelector.matchFields in scheduler. Apr 24, 2018

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Apr 24, 2018

k82cn force-pushed the k8s_61410_2 branch from 0b1bc55 to 929efb5 Compare April 26, 2018 05:53

ravisantoshgudimetla reviewed Apr 27, 2018

View reviewed changes

bsalamat reviewed Apr 28, 2018

View reviewed changes

Supported matchField for NodeAffinity.

b1a7f85

Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>

k82cn force-pushed the k8s_61410_2 branch from 929efb5 to b1a7f85 Compare April 28, 2018 03:10

ravisantoshgudimetla approved these changes May 9, 2018

View reviewed changes

k8s-ci-robot assigned ravisantoshgudimetla May 9, 2018

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 9, 2018

k8s-github-robot merged commit 0949cef into kubernetes:master May 9, 2018

k82cn deleted the k8s_61410_2 branch May 9, 2018 10:19

janetkuo reviewed May 14, 2018

View reviewed changes

alvaroaleman mentioned this pull request Oct 2, 2018

1.10 kubelet doesn't start any daemonset containers with 1.12 control plane #69346

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Supported nodeSelector.matchFields in scheduler. #62453

Supported nodeSelector.matchFields in scheduler. #62453

k82cn commented Apr 12, 2018

k82cn commented Apr 24, 2018

k82cn commented Apr 26, 2018

ravisantoshgudimetla Apr 27, 2018

ravisantoshgudimetla left a comment •

edited

Loading

bsalamat Apr 28, 2018

k82cn Apr 30, 2018

bsalamat Apr 28, 2018

bsalamat Apr 28, 2018

bsalamat Apr 28, 2018

bsalamat Apr 28, 2018

k82cn Apr 28, 2018

k82cn commented May 9, 2018

ravisantoshgudimetla left a comment

ravisantoshgudimetla commented May 9, 2018

k8s-ci-robot commented May 9, 2018

k82cn commented May 9, 2018

k8s-github-robot commented May 9, 2018

k8s-github-robot commented May 9, 2018

janetkuo May 14, 2018

Supported nodeSelector.matchFields in scheduler. #62453

Supported nodeSelector.matchFields in scheduler. #62453

Conversation

k82cn commented Apr 12, 2018

k82cn commented Apr 24, 2018

k82cn commented Apr 26, 2018

Choose a reason for hiding this comment

ravisantoshgudimetla left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

k82cn commented May 9, 2018

ravisantoshgudimetla left a comment

Choose a reason for hiding this comment

ravisantoshgudimetla commented May 9, 2018

k8s-ci-robot commented May 9, 2018

k82cn commented May 9, 2018

k8s-github-robot commented May 9, 2018

k8s-github-robot commented May 9, 2018

Choose a reason for hiding this comment

ravisantoshgudimetla left a comment •

edited

Loading