Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
97878810
Unverified
Commit
97878810
authored
Mar 20, 2018
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable DaemonSet scheduling feature for 1.10
parent
c83dd042
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
daemon_controller.go
pkg/controller/daemon/daemon_controller.go
+2
-2
daemon_controller_test.go
pkg/controller/daemon/daemon_controller_test.go
+2
-0
No files found.
pkg/controller/daemon/daemon_controller.go
View file @
97878810
...
@@ -938,7 +938,7 @@ func (dsc *DaemonSetsController) syncNodes(ds *apps.DaemonSet, podsToDelete, nod
...
@@ -938,7 +938,7 @@ func (dsc *DaemonSetsController) syncNodes(ds *apps.DaemonSet, podsToDelete, nod
podTemplate
:=
&
template
podTemplate
:=
&
template
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ScheduleDaemonSetPods
)
{
if
false
/*disabled for 1.10*/
&&
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ScheduleDaemonSetPods
)
{
podTemplate
=
template
.
DeepCopy
()
podTemplate
=
template
.
DeepCopy
()
podTemplate
.
Spec
.
Affinity
=
util
.
ReplaceDaemonSetPodHostnameNodeAffinity
(
podTemplate
.
Spec
.
Affinity
=
util
.
ReplaceDaemonSetPodHostnameNodeAffinity
(
podTemplate
.
Spec
.
Affinity
,
nodesNeedingDaemonPods
[
ix
])
podTemplate
.
Spec
.
Affinity
,
nodesNeedingDaemonPods
[
ix
])
...
@@ -1390,7 +1390,7 @@ func Predicates(pod *v1.Pod, nodeInfo *schedulercache.NodeInfo) (bool, []algorit
...
@@ -1390,7 +1390,7 @@ func Predicates(pod *v1.Pod, nodeInfo *schedulercache.NodeInfo) (bool, []algorit
var
predicateFails
[]
algorithm
.
PredicateFailureReason
var
predicateFails
[]
algorithm
.
PredicateFailureReason
// If ScheduleDaemonSetPods is enabled, only check nodeSelector and nodeAffinity.
// If ScheduleDaemonSetPods is enabled, only check nodeSelector and nodeAffinity.
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ScheduleDaemonSetPods
)
{
if
false
/*disabled for 1.10*/
&&
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ScheduleDaemonSetPods
)
{
fit
,
reasons
,
err
:=
nodeSelectionPredicates
(
pod
,
nil
,
nodeInfo
)
fit
,
reasons
,
err
:=
nodeSelectionPredicates
(
pod
,
nil
,
nodeInfo
)
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
predicateFails
,
err
return
false
,
predicateFails
,
err
...
...
pkg/controller/daemon/daemon_controller_test.go
View file @
97878810
...
@@ -453,6 +453,8 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
...
@@ -453,6 +453,8 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
// When ScheduleDaemonSetPods is enabled, DaemonSets without node selectors should
// When ScheduleDaemonSetPods is enabled, DaemonSets without node selectors should
// launch pods on every node by NodeAffinity.
// launch pods on every node by NodeAffinity.
func
TestSimpleDaemonSetScheduleDaemonSetPodsLaunchesPods
(
t
*
testing
.
T
)
{
func
TestSimpleDaemonSetScheduleDaemonSetPodsLaunchesPods
(
t
*
testing
.
T
)
{
t
.
Skip
(
"disabled for 1.10"
)
enabled
:=
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ScheduleDaemonSetPods
)
enabled
:=
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ScheduleDaemonSetPods
)
// Rollback feature gate.
// Rollback feature gate.
defer
func
()
{
defer
func
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment