UPSTREAM: <carry>: Node selector aware DS controller should not process

openshift-io/node-selector if scheduler.alpha.kubernetes.io/node-selector is set.
openshift · Sep 20, 2018 · bb54fb4 · bb54fb4
1 parent c5e6825
commit bb54fb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/patch_nodeselector.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/patch_nodeselector.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/patch_nodeselector_test.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/patch_nodeselector_test.go