From 05e4ccecb17826302011e67e231464879d65ac65 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 20 Mar 2018 10:50:37 -0400 Subject: [PATCH] disable DaemonSet scheduling feature for 1.10 --- pkg/controller/daemon/daemon_controller.go | 4 ++-- pkg/controller/daemon/daemon_controller_test.go | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go index eec8fc19cf7..a640f1acdac 100644 --- a/pkg/controller/daemon/daemon_controller.go +++ b/pkg/controller/daemon/daemon_controller.go @@ -938,7 +938,7 @@ func (dsc *DaemonSetsController) syncNodes(ds *apps.DaemonSet, podsToDelete, nod podTemplate := &template - if utilfeature.DefaultFeatureGate.Enabled(features.ScheduleDaemonSetPods) { + if false /*disabled for 1.10*/ && utilfeature.DefaultFeatureGate.Enabled(features.ScheduleDaemonSetPods) { podTemplate = template.DeepCopy() podTemplate.Spec.Affinity = util.ReplaceDaemonSetPodHostnameNodeAffinity( podTemplate.Spec.Affinity, nodesNeedingDaemonPods[ix]) @@ -1390,7 +1390,7 @@ func Predicates(pod *v1.Pod, nodeInfo *schedulercache.NodeInfo) (bool, []algorit var predicateFails []algorithm.PredicateFailureReason // 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) if err != nil { return false, predicateFails, err diff --git a/pkg/controller/daemon/daemon_controller_test.go b/pkg/controller/daemon/daemon_controller_test.go index 4424dda018b..4dbcbf57c4c 100644 --- a/pkg/controller/daemon/daemon_controller_test.go +++ b/pkg/controller/daemon/daemon_controller_test.go @@ -453,6 +453,8 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) { // When ScheduleDaemonSetPods is enabled, DaemonSets without node selectors should // launch pods on every node by NodeAffinity. func TestSimpleDaemonSetScheduleDaemonSetPodsLaunchesPods(t *testing.T) { + t.Skip("disabled for 1.10") + enabled := utilfeature.DefaultFeatureGate.Enabled(features.ScheduleDaemonSetPods) // Rollback feature gate. defer func() {