Stop checking VolumeScheduling feature gate

pkg/volume/awsebs/aws_ebs.go

@@ -576,12 +576,10 @@ func (c *awsElasticBlockStoreProvisioner) Provision(selectedNode *v1.Node, allow
 		}
 	}
 
-	if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
-		pv.Spec.NodeAffinity = new(v1.VolumeNodeAffinity)
-		pv.Spec.NodeAffinity.Required = new(v1.NodeSelector)
-		pv.Spec.NodeAffinity.Required.NodeSelectorTerms = make([]v1.NodeSelectorTerm, 1)
-		pv.Spec.NodeAffinity.Required.NodeSelectorTerms[0].MatchExpressions = requirements
-	}
+	pv.Spec.NodeAffinity = new(v1.VolumeNodeAffinity)
+	pv.Spec.NodeAffinity.Required = new(v1.NodeSelector)
+	pv.Spec.NodeAffinity.Required.NodeSelectorTerms = make([]v1.NodeSelectorTerm, 1)
+	pv.Spec.NodeAffinity.Required.NodeSelectorTerms[0].MatchExpressions = requirements
 
 	return pv, nil
 }

pkg/volume/azure_dd/azure_provision.go

@@ -311,51 +311,49 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
 		},
 	}
 
-	if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
-		nodeSelectorTerms := make([]v1.NodeSelectorTerm, 0)
+	nodeSelectorTerms := make([]v1.NodeSelectorTerm, 0)
 
-		if zoned {
-			// Set node affinity labels based on availability zone labels.
-			if len(labels) > 0 {
-				requirements := make([]v1.NodeSelectorRequirement, 0)
-				for k, v := range labels {
-					requirements = append(requirements, v1.NodeSelectorRequirement{Key: k, Operator: v1.NodeSelectorOpIn, Values: []string{v}})
-				}
+	if zoned {
+		// Set node affinity labels based on availability zone labels.
+		if len(labels) > 0 {
+			requirements := make([]v1.NodeSelectorRequirement, 0)
+			for k, v := range labels {
+				requirements = append(requirements, v1.NodeSelectorRequirement{Key: k, Operator: v1.NodeSelectorOpIn, Values: []string{v}})
+			}
 
-				nodeSelectorTerms = append(nodeSelectorTerms, v1.NodeSelectorTerm{
-					MatchExpressions: requirements,
-				})
-			}
-		} else {
-			// Set node affinity labels based on fault domains.
-			// This is required because unzoned AzureDisk can't be attached to zoned nodes.
-			// There are at most 3 fault domains available in each region.
-			// Refer https://docs.microsoft.com/en-us/azure/virtual-machines/windows/manage-availability.
-			for i := 0; i < 3; i++ {
-				requirements := []v1.NodeSelectorRequirement{
-					{
-						Key:      kubeletapis.LabelZoneRegion,
-						Operator: v1.NodeSelectorOpIn,
-						Values:   []string{diskController.GetLocation()},
-					},
-					{
-						Key:      kubeletapis.LabelZoneFailureDomain,
-						Operator: v1.NodeSelectorOpIn,
-						Values:   []string{strconv.Itoa(i)},
-					},
-				}
-				nodeSelectorTerms = append(nodeSelectorTerms, v1.NodeSelectorTerm{
-					MatchExpressions: requirements,
-				})
-			}
+			nodeSelectorTerms = append(nodeSelectorTerms, v1.NodeSelectorTerm{
+				MatchExpressions: requirements,
+			})
 		}
-
-		if len(nodeSelectorTerms) > 0 {
-			pv.Spec.NodeAffinity = &v1.VolumeNodeAffinity{
-				Required: &v1.NodeSelector{
-					NodeSelectorTerms: nodeSelectorTerms,
+	} else {
+		// Set node affinity labels based on fault domains.
+		// This is required because unzoned AzureDisk can't be attached to zoned nodes.
+		// There are at most 3 fault domains available in each region.
+		// Refer https://docs.microsoft.com/en-us/azure/virtual-machines/windows/manage-availability.
+		for i := 0; i < 3; i++ {
+			requirements := []v1.NodeSelectorRequirement{
+				{
+					Key:      kubeletapis.LabelZoneRegion,
+					Operator: v1.NodeSelectorOpIn,
+					Values:   []string{diskController.GetLocation()},
+				},
+				{
+					Key:      kubeletapis.LabelZoneFailureDomain,
+					Operator: v1.NodeSelectorOpIn,
+					Values:   []string{strconv.Itoa(i)},
 				},
 			}
+			nodeSelectorTerms = append(nodeSelectorTerms, v1.NodeSelectorTerm{
+				MatchExpressions: requirements,
+			})
+		}
+	}
+
+	if len(nodeSelectorTerms) > 0 {
+		pv.Spec.NodeAffinity = &v1.VolumeNodeAffinity{
+			Required: &v1.NodeSelector{
+				NodeSelectorTerms: nodeSelectorTerms,
+			},
 		}
 	}
 

pkg/volume/cinder/cinder.go

@@ -561,20 +561,18 @@ func (c *cinderVolumeProvisioner) Provision(selectedNode *v1.Node, allowedTopolo
 		pv.Spec.AccessModes = c.plugin.GetAccessModes()
 	}
 
-	if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
-		requirements := make([]v1.NodeSelectorRequirement, 0)
-		for k, v := range labels {
-			if v != "" {
-				requirements = append(requirements, v1.NodeSelectorRequirement{Key: k, Operator: v1.NodeSelectorOpIn, Values: []string{v}})
-			}
-		}
-		if len(requirements) > 0 {
-			pv.Spec.NodeAffinity = new(v1.VolumeNodeAffinity)
-			pv.Spec.NodeAffinity.Required = new(v1.NodeSelector)
-			pv.Spec.NodeAffinity.Required.NodeSelectorTerms = make([]v1.NodeSelectorTerm, 1)
-			pv.Spec.NodeAffinity.Required.NodeSelectorTerms[0].MatchExpressions = requirements
+	requirements := make([]v1.NodeSelectorRequirement, 0)
+	for k, v := range labels {
+		if v != "" {
+			requirements = append(requirements, v1.NodeSelectorRequirement{Key: k, Operator: v1.NodeSelectorOpIn, Values: []string{v}})
 		}
 	}
+	if len(requirements) > 0 {
+		pv.Spec.NodeAffinity = new(v1.VolumeNodeAffinity)
+		pv.Spec.NodeAffinity.Required = new(v1.NodeSelector)
+		pv.Spec.NodeAffinity.Required.NodeSelectorTerms = make([]v1.NodeSelectorTerm, 1)
+		pv.Spec.NodeAffinity.Required.NodeSelectorTerms[0].MatchExpressions = requirements
+	}
 
 	return pv, nil
 }

pkg/volume/gcepd/gce_pd.go

@@ -551,7 +551,7 @@ func (c *gcePersistentDiskProvisioner) Provision(selectedNode *v1.Node, allowedT
 		}
 	}
 
-	if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) && len(requirements) > 0 {
+	if len(requirements) > 0 {
 		pv.Spec.NodeAffinity = new(v1.VolumeNodeAffinity)
 		pv.Spec.NodeAffinity.Required = new(v1.NodeSelector)
 		pv.Spec.NodeAffinity.Required.NodeSelectorTerms = make([]v1.NodeSelectorTerm, 1)

pkg/volume/util/BUILD

@@ -60,7 +60,6 @@ go_test(
     deps = [
         "//pkg/apis/core/install:go_default_library",
         "//pkg/apis/core/v1/helper:go_default_library",
-        "//pkg/features:go_default_library",
         "//pkg/kubelet/apis:go_default_library",
         "//pkg/util/mount:go_default_library",
         "//pkg/util/slice:go_default_library",
@@ -70,8 +69,6 @@ go_test(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
     ],
 )

pkg/volume/util/util_test.go

@@ -24,7 +24,6 @@ import (
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
 	utiltesting "k8s.io/client-go/util/testing"
 
 	// util.go uses api.Codecs.LegacyCodec so import this package to do some
@@ -32,7 +31,6 @@ import (
 	"hash/fnv"
 
 	_ "k8s.io/kubernetes/pkg/apis/core/install"
-	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/util/mount"
 
 	"reflect"
@@ -40,7 +38,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
 
 	"k8s.io/kubernetes/pkg/util/slice"
@@ -1065,7 +1062,6 @@ func TestSelectZoneForVolume(t *testing.T) {
 		ZonesWithNodes    string
 		Node              *v1.Node
 		AllowedTopologies []v1.TopologySelectorTerm
-		VolumeScheduling  bool
 		// Expectations around returned zone from SelectZoneForVolume
 		Reject             bool   // expect error due to validation failing
 		ExpectSpecificZone bool   // expect returned zone to specifically match a single zone (rather than one from a set)
@@ -1078,7 +1074,6 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] Node irrelevant
 		// [2] Zone and Zones parameters presents
 		// [3] AllowedTopologies irrelevant
-		// [4] VolumeScheduling irrelevant
 		{
 			Name:         "Nil_Node_with_Zone_Zones_parameters_present",
 			ZonePresent:  true,
@@ -1092,53 +1087,45 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] Node with no zone labels
 		// [2] Zone/Zones parameter irrelevant
 		// [3] AllowedTopologies irrelevant
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Node_with_no_Zone_labels",
-			Node:             nodeWithNoLabels,
-			VolumeScheduling: true,
-			Reject:           true,
+			Name:   "Node_with_no_Zone_labels",
+			Node:   nodeWithNoLabels,
+			Reject: true,
 		},
 
 		// Node with Zone labels as well as Zone parameter specified [Fail]
 		// [1] Node with zone labels
 		// [2] Zone parameter specified
 		// [3] AllowedTopologies irrelevant
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Node_with_Zone_labels_and_Zone_parameter_present",
-			Node:             nodeWithZoneLabels,
-			ZonePresent:      true,
-			Zone:             "zoneX",
-			VolumeScheduling: true,
-			Reject:           true,
+			Name:        "Node_with_Zone_labels_and_Zone_parameter_present",
+			Node:        nodeWithZoneLabels,
+			ZonePresent: true,
+			Zone:        "zoneX",
+			Reject:      true,
 		},
 
 		// Node with Zone labels as well as Zones parameter specified [Fail]
 		// [1] Node with zone labels
 		// [2] Zones parameter specified
 		// [3] AllowedTopologies irrelevant
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Node_with_Zone_labels_and_Zones_parameter_present",
-			Node:             nodeWithZoneLabels,
-			ZonesPresent:     true,
-			Zones:            "zoneX,zoneY",
-			VolumeScheduling: true,
-			Reject:           true,
+			Name:         "Node_with_Zone_labels_and_Zones_parameter_present",
+			Node:         nodeWithZoneLabels,
+			ZonesPresent: true,
+			Zones:        "zoneX,zoneY",
+			Reject:       true,
 		},
 
 		// Zone parameter as well as AllowedTopologies specified [Fail]
 		// [1] nil Node
 		// [2] Zone parameter specified
 		// [3] AllowedTopologies specified
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Zone_parameter_and_Allowed_Topology_term",
-			Node:             nil,
-			ZonePresent:      true,
-			Zone:             "zoneX",
-			VolumeScheduling: true,
+			Name:        "Nil_Node_and_Zone_parameter_and_Allowed_Topology_term",
+			Node:        nil,
+			ZonePresent: true,
+			Zone:        "zoneX",
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1156,13 +1143,11 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] Zones parameter specified
 		// [3] AllowedTopologies specified
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Zones_parameter_and_Allowed_Topology_term",
-			Node:             nil,
-			ZonesPresent:     true,
-			Zones:            "zoneX,zoneY",
-			VolumeScheduling: true,
+			Name:         "Nil_Node_and_Zones_parameter_and_Allowed_Topology_term",
+			Node:         nil,
+			ZonesPresent: true,
+			Zones:        "zoneX,zoneY",
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1180,11 +1165,9 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] no Zone/Zones parameter
 		// [3] AllowedTopologies with invalid key specified
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Invalid_Allowed_Topology_Key",
-			Node:             nil,
-			VolumeScheduling: true,
+			Name: "Nil_Node_and_Invalid_Allowed_Topology_Key",
+			Node: nil,
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1206,11 +1189,9 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] no Zone/Zones parameter
 		// [3] Invalid AllowedTopologies
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Invalid_AllowedTopologies",
-			Node:             nil,
-			VolumeScheduling: true,
+			Name: "Nil_Node_and_Invalid_AllowedTopologies",
+			Node: nil,
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{},
@@ -1219,77 +1200,29 @@ func TestSelectZoneForVolume(t *testing.T) {
 			Reject: true,
 		},
 
-		// POSITIVE TESTS WITH VolumeScheduling DISABLED
-
-		// Select zone from active zones [Pass]
-		// [1] nil Node (Node irrelevant)
-		// [2] no Zone parameter
-		// [3] no AllowedTopologies
-		// [4] VolumeScheduling disabled
-		{
-			Name:             "No_Zone_Zones_parameter_and_VolumeScheduling_disabled",
-			ZonesWithNodes:   "zoneX,zoneY",
-			VolumeScheduling: false,
-			Reject:           false,
-			ExpectedZones:    "zoneX,zoneY",
-		},
-
-		// Select zone from single zone parameter [Pass]
-		// [1] nil Node (Node irrelevant)
-		// [2] Zone parameter specified
-		// [3] no AllowedTopologies
-		// [4] VolumeScheduling disabled
-		{
-			Name:               "Zone_parameter_present_and_VolumeScheduling_disabled",
-			ZonePresent:        true,
-			Zone:               "zoneX",
-			VolumeScheduling:   false,
-			Reject:             false,
-			ExpectSpecificZone: true,
-			ExpectedZone:       "zoneX",
-		},
-
-		// Select zone from zones parameter [Pass]
-		// [1] nil Node (Node irrelevant)
-		// [2] Zones parameter specified
-		// [3] no AllowedTopologies
-		// [4] VolumeScheduling disabled
-		{
-			Name:             "Zones_parameter_present_and_VolumeScheduling_disabled",
-			ZonesPresent:     true,
-			Zones:            "zoneX,zoneY",
-			VolumeScheduling: false,
-			Reject:           false,
-			ExpectedZones:    "zoneX,zoneY",
-		},
-
 		// POSITIVE TESTS WITH VolumeScheduling ENABLED
 
 		// Select zone from active zones [Pass]
 		// [1] nil Node
 		// [2] no Zone parameter specified
 		// [3] no AllowedTopologies
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_No_Zone_Zones_parameter_and_no_Allowed_topologies_and_VolumeScheduling_enabled",
-			Node:             nil,
-			ZonesWithNodes:   "zoneX,zoneY",
-			VolumeScheduling: true,
-			Reject:           false,
-			ExpectedZones:    "zoneX,zoneY",
+			Name:           "Nil_Node_and_No_Zone_Zones_parameter_and_no_Allowed_topologies_and_VolumeScheduling_enabled",
+			Node:           nil,
+			ZonesWithNodes: "zoneX,zoneY",
+			Reject:         false,
+			ExpectedZones:  "zoneX,zoneY",
 		},
 
 		// Select zone from single zone parameter [Pass]
 		// [1] nil Node
 		// [2] Zone parameter specified
 		// [3] no AllowedTopology specified
-		// [4] VolumeScheduling enabled
 		{
 			Name:               "Nil_Node_and_Zone_parameter_present_and_VolumeScheduling_enabled",
 			ZonePresent:        true,
 			Zone:               "zoneX",
 			Node:               nil,
-			VolumeScheduling:   true,
 			Reject:             false,
 			ExpectSpecificZone: true,
 			ExpectedZone:       "zoneX",
@@ -1299,26 +1232,22 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] Zones parameter specified
 		// [3] no AllowedTopology
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Zones_parameter_present_and_VolumeScheduling_enabled",
-			ZonesPresent:     true,
-			Zones:            "zoneX,zoneY",
-			Node:             nil,
-			VolumeScheduling: true,
-			Reject:           false,
-			ExpectedZones:    "zoneX,zoneY",
+			Name:          "Nil_Node_and_Zones_parameter_present_and_VolumeScheduling_enabled",
+			ZonesPresent:  true,
+			Zones:         "zoneX,zoneY",
+			Node:          nil,
+			Reject:        false,
+			ExpectedZones: "zoneX,zoneY",
 		},
 
 		// Select zone from node label [Pass]
 		// [1] Node with zone labels
 		// [2] no zone/zones parameters
 		// [3] no AllowedTopology
-		// [4] VolumeScheduling enabled
 		{
 			Name:               "Node_with_Zone_labels_and_VolumeScheduling_enabled",
 			Node:               nodeWithZoneLabels,
-			VolumeScheduling:   true,
 			Reject:             false,
 			ExpectSpecificZone: true,
 			ExpectedZone:       "zoneX",
@@ -1328,11 +1257,9 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] Node with zone labels
 		// [2] no Zone/Zones parameters
 		// [3] AllowedTopology with single term with multiple values specified (ignored)
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Node_with_Zone_labels_and_Multiple_Allowed_Topology_values_and_VolumeScheduling_enabled",
-			Node:             nodeWithZoneLabels,
-			VolumeScheduling: true,
+			Name: "Node_with_Zone_labels_and_Multiple_Allowed_Topology_values_and_VolumeScheduling_enabled",
+			Node: nodeWithZoneLabels,
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1352,11 +1279,9 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] no Zone/Zones parametes specified
 		// [3] AllowedTopologies with single term with multiple values specified
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_with_Multiple_Allowed_Topology_values_and_VolumeScheduling_enabled",
-			Node:             nil,
-			VolumeScheduling: true,
+			Name: "Nil_Node_with_Multiple_Allowed_Topology_values_and_VolumeScheduling_enabled",
+			Node: nil,
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1375,11 +1300,9 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] no Zone/Zones parametes specified
 		// [3] AllowedTopologies with multiple terms specified
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Multiple_Allowed_Topology_terms_and_VolumeScheduling_enabled",
-			Node:             nil,
-			VolumeScheduling: true,
+			Name: "Nil_Node_and_Multiple_Allowed_Topology_terms_and_VolumeScheduling_enabled",
+			Node: nil,
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1407,11 +1330,9 @@ func TestSelectZoneForVolume(t *testing.T) {
 		// [1] nil Node
 		// [2] no Zone/Zones parametes specified
 		// [3] AllowedTopologies with single term and value specified
-		// [4] VolumeScheduling enabled
 		{
-			Name:             "Nil_Node_and_Single_Allowed_Topology_term_value_and_VolumeScheduling_enabled",
-			Node:             nil,
-			VolumeScheduling: true,
+			Name: "Nil_Node_and_Single_Allowed_Topology_term_value_and_VolumeScheduling_enabled",
+			Node: nil,
 			AllowedTopologies: []v1.TopologySelectorTerm{
 				{
 					MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1430,8 +1351,6 @@ func TestSelectZoneForVolume(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.Name, func(t *testing.T) {
-			defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.VolumeScheduling, test.VolumeScheduling)()
-
 			var zonesParameter, zonesWithNodes sets.String
 			var err error