Commit f2d0786

committed

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

openshift-io/node-selector if scheduler.alpha.kubernetes.io/node-selector is set.

1 parent 9eafa33 commit f2d0786Copy full SHA for f2d0786

2 files changed

+16

-13

lines changed

vendor/k8s.io/kubernetes/pkg/controller/daemon
- patch_nodeselector.go
- patch_nodeselector_test.go

2 files changed

+16

-13

lines changed

`‎vendor/k8s.io/kubernetes/pkg/controller/daemon/patch_nodeselector.go`

+13-11

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎vendor/k8s.io/kubernetes/pkg/controller/daemon/patch_nodeselector_test.go`

+3-2

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)