Merge pull request #61412 from liggitt/automated-cherry-pick-of-#61411-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61411: disable DaemonSet scheduling feature for 1.10 Cherry pick of #61411 on release-1.10. related to https://github.com/kubernetes/kubernetes/issues/61050 #61411: disable DaemonSet scheduling feature for 1.10 ```release-note DaemonSet scheduling associated with the alpha ScheduleDaemonSetPods feature flag has been removed from the 1.10 release. See https://github.com/kubernetes/features/issues/548 for feature status. ```

Merge pull request #61412 from liggitt/automated-cherry-pick-of-#61411-upstream-release-1.10
4b261106 · Kubernetes Submit Queue · GitHub · c83dd042 · 97878810 · 4b261106
Unverified Commit 4b261106 authored Mar 20, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

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.
--- 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

--- 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() {