From affcd0128b5e47688a45596de59352af1fcdddb8 Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Wed, 16 Oct 2019 12:58:28 +0200 Subject: [PATCH] Promote volume limits to GA --- pkg/features/kube_features.go | 4 +- pkg/kubelet/kubelet_node_status.go | 8 +-- pkg/registry/storage/csinode/BUILD | 5 -- pkg/registry/storage/csinode/strategy.go | 33 ---------- pkg/registry/storage/csinode/strategy_test.go | 64 ++----------------- .../predicates/csi_volume_predicate.go | 6 -- .../predicates/csi_volume_predicate_test.go | 1 - .../max_attachable_volume_predicate_test.go | 29 --------- .../algorithm/predicates/predicates.go | 8 +-- .../apis/config/testing/compatibility_test.go | 24 ------- .../plugins/nodevolumelimits/azure_test.go | 5 -- .../plugins/nodevolumelimits/cinder_test.go | 5 -- .../plugins/nodevolumelimits/csi_test.go | 1 - .../plugins/nodevolumelimits/ebs_test.go | 5 -- .../plugins/nodevolumelimits/gce_test.go | 5 -- .../csi/nodeinfomanager/nodeinfomanager.go | 18 +++--- .../nodeinfomanager/nodeinfomanager_test.go | 1 - .../authorizer/rbac/bootstrappolicy/policy.go | 6 +- 18 files changed, 23 insertions(+), 205 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 3158286c859..105dc0795cc 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -282,6 +282,8 @@ const ( // owner: @gnufied // beta : v1.12 + // GA : v1.17 + // // Add support for volume plugins to report node specific // volume limits @@ -523,7 +525,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ExpandPersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandCSIVolumes: {Default: true, PreRelease: featuregate.Beta}, - AttachVolumeLimit: {Default: true, PreRelease: featuregate.Beta}, + AttachVolumeLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.19 CPUManager: {Default: true, PreRelease: featuregate.Beta}, CPUCFSQuotaPeriod: {Default: false, PreRelease: featuregate.Alpha}, TopologyManager: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index af41b4856a7..f56817ebcd9 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -31,12 +31,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utilfeature "k8s.io/apiserver/pkg/util/feature" cloudprovider "k8s.io/cloud-provider" "k8s.io/klog" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/nodestatus" @@ -548,9 +546,9 @@ func (kl *Kubelet) defaultNodeStatusFuncs() []func(*v1.Node) error { nodestatus.Images(kl.nodeStatusMaxImages, kl.imageManager.GetImageList), nodestatus.GoRuntime(), ) - if utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - setters = append(setters, nodestatus.VolumeLimits(kl.volumePluginMgr.ListVolumePluginWithLimits)) - } + // Volume limits + setters = append(setters, nodestatus.VolumeLimits(kl.volumePluginMgr.ListVolumePluginWithLimits)) + setters = append(setters, nodestatus.MemoryPressureCondition(kl.clock.Now, kl.evictionManager.IsUnderMemoryPressure, kl.recordNodeStatusEvent), nodestatus.DiskPressureCondition(kl.clock.Now, kl.evictionManager.IsUnderDiskPressure, kl.recordNodeStatusEvent), diff --git a/pkg/registry/storage/csinode/BUILD b/pkg/registry/storage/csinode/BUILD index 1c90ff26a87..f14adabc140 100644 --- a/pkg/registry/storage/csinode/BUILD +++ b/pkg/registry/storage/csinode/BUILD @@ -12,11 +12,9 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/validation:go_default_library", - "//pkg/features:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/names:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", ], ) @@ -43,12 +41,9 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/storage:go_default_library", - "//pkg/features:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", - "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/registry/storage/csinode/strategy.go b/pkg/registry/storage/csinode/strategy.go index 160f6d5f566..d7ac8871e4f 100644 --- a/pkg/registry/storage/csinode/strategy.go +++ b/pkg/registry/storage/csinode/strategy.go @@ -22,11 +22,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apiserver/pkg/storage/names" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage/validation" - "k8s.io/kubernetes/pkg/features" ) // csiNodeStrategy implements behavior for CSINode objects @@ -45,12 +43,6 @@ func (csiNodeStrategy) NamespaceScoped() bool { // PrepareForCreate clears fields that are not allowed to be set on creation. func (csiNodeStrategy) PrepareForCreate(ctx context.Context, obj runtime.Object) { - csiNode := obj.(*storage.CSINode) - if !utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - for i := range csiNode.Spec.Drivers { - csiNode.Spec.Drivers[i].Allocatable = nil - } - } } func (csiNodeStrategy) Validate(ctx context.Context, obj runtime.Object) field.ErrorList { @@ -72,31 +64,6 @@ func (csiNodeStrategy) AllowCreateOnUpdate() bool { // PrepareForUpdate sets the driver's Allocatable fields that are not allowed to be set by an end user updating a CSINode. func (csiNodeStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) { - newCSINode := obj.(*storage.CSINode) - oldCSINode := old.(*storage.CSINode) - - inUse := getAllocatablesInUse(oldCSINode) - - if !utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - for i := range newCSINode.Spec.Drivers { - if !inUse[newCSINode.Spec.Drivers[i].Name] { - newCSINode.Spec.Drivers[i].Allocatable = nil - } - } - } -} - -func getAllocatablesInUse(obj *storage.CSINode) map[string]bool { - inUse := make(map[string]bool) - if obj == nil { - return inUse - } - for i := range obj.Spec.Drivers { - if obj.Spec.Drivers[i].Allocatable != nil { - inUse[obj.Spec.Drivers[i].Name] = true - } - } - return inUse } func (csiNodeStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList { diff --git a/pkg/registry/storage/csinode/strategy_test.go b/pkg/registry/storage/csinode/strategy_test.go index 07dee6b73b0..e228a63a8d5 100644 --- a/pkg/registry/storage/csinode/strategy_test.go +++ b/pkg/registry/storage/csinode/strategy_test.go @@ -23,10 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/pkg/apis/storage" - "k8s.io/kubernetes/pkg/features" utilpointer "k8s.io/utils/pointer" ) @@ -47,7 +44,7 @@ func TestPrepareForCreate(t *testing.T) { }, } - volumeLimitsEnabledCases := []struct { + volumeLimitsCases := []struct { name string obj *storage.CSINode expected *storage.CSINode @@ -64,32 +61,7 @@ func TestPrepareForCreate(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - for _, test := range volumeLimitsEnabledCases { - t.Run(test.name, func(t *testing.T) { - testPrepareForCreate(t, test.obj, test.expected) - }) - } - - volumeLimitsDisabledCases := []struct { - name string - obj *storage.CSINode - expected *storage.CSINode - }{ - { - "empty allocatable", - emptyAllocatable, - emptyAllocatable, - }, - { - "drop allocatable", - valid, - emptyAllocatable, - }, - } - - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, false)() - for _, test := range volumeLimitsDisabledCases { + for _, test := range volumeLimitsCases { t.Run(test.name, func(t *testing.T) { testPrepareForCreate(t, test.obj, test.expected) }) @@ -140,7 +112,7 @@ func TestPrepareForUpdate(t *testing.T) { }, } - volumeLimitsEnabledCases := []struct { + volumeLimitsCases := []struct { name string old *storage.CSINode new *storage.CSINode @@ -166,35 +138,7 @@ func TestPrepareForUpdate(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - for _, test := range volumeLimitsEnabledCases { - t.Run(test.name, func(t *testing.T) { - testPrepareForUpdate(t, test.new, test.old, test.expected) - }) - } - - volumeLimitsDisabledCases := []struct { - name string - old *storage.CSINode - new *storage.CSINode - expected *storage.CSINode - }{ - { - "allow empty allocatable when it's not set", - emptyAllocatable, - emptyAllocatable, - emptyAllocatable, - }, - { - "drop allocatable when it's not set", - emptyAllocatable, - valid, - emptyAllocatable, - }, - } - - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, false)() - for _, test := range volumeLimitsDisabledCases { + for _, test := range volumeLimitsCases { t.Run(test.name, func(t *testing.T) { testPrepareForUpdate(t, test.new, test.old, test.expected) }) diff --git a/pkg/scheduler/algorithm/predicates/csi_volume_predicate.go b/pkg/scheduler/algorithm/predicates/csi_volume_predicate.go index 7d6236f72ab..46809a3bf1f 100644 --- a/pkg/scheduler/algorithm/predicates/csi_volume_predicate.go +++ b/pkg/scheduler/algorithm/predicates/csi_volume_predicate.go @@ -22,14 +22,12 @@ import ( v1 "k8s.io/api/core/v1" storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/util/rand" - utilfeature "k8s.io/apiserver/pkg/util/feature" corelisters "k8s.io/client-go/listers/core/v1" storagelisters "k8s.io/client-go/listers/storage/v1" v1beta1storagelisters "k8s.io/client-go/listers/storage/v1beta1" csitrans "k8s.io/csi-translation-lib" "k8s.io/klog" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - "k8s.io/kubernetes/pkg/features" schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" volumeutil "k8s.io/kubernetes/pkg/volume/util" ) @@ -93,10 +91,6 @@ func (c *CSIMaxVolumeLimitChecker) attachableLimitPredicate( return true, nil, nil } - if !utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - return true, nil, nil - } - node := nodeInfo.Node() if node == nil { return false, nil, fmt.Errorf("node not found") diff --git a/pkg/scheduler/algorithm/predicates/csi_volume_predicate_test.go b/pkg/scheduler/algorithm/predicates/csi_volume_predicate_test.go index cee8bf8c861..9ec8c0d11fb 100644 --- a/pkg/scheduler/algorithm/predicates/csi_volume_predicate_test.go +++ b/pkg/scheduler/algorithm/predicates/csi_volume_predicate_test.go @@ -434,7 +434,6 @@ func TestCSIVolumeCountPredicate(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() // running attachable predicate tests with feature gate and limit present on nodes for _, test := range tests { t.Run(test.test, func(t *testing.T) { diff --git a/pkg/scheduler/algorithm/predicates/max_attachable_volume_predicate_test.go b/pkg/scheduler/algorithm/predicates/max_attachable_volume_predicate_test.go index 6f69a4b5c9f..373e979c464 100644 --- a/pkg/scheduler/algorithm/predicates/max_attachable_volume_predicate_test.go +++ b/pkg/scheduler/algorithm/predicates/max_attachable_volume_predicate_test.go @@ -19,7 +19,6 @@ package predicates import ( "os" "reflect" - "strconv" "strings" "testing" @@ -27,10 +26,7 @@ import ( "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" csilibplugins "k8s.io/csi-translation-lib/plugins" - "k8s.io/kubernetes/pkg/features" fakelisters "k8s.io/kubernetes/pkg/scheduler/listers/fake" schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" volumeutil "k8s.io/kubernetes/pkg/volume/util" @@ -848,31 +844,6 @@ func TestVolumeCountConflicts(t *testing.T) { expectedFailureReasons := []PredicateFailureReason{ErrMaxVolumeCountExceeded} - // running attachable predicate tests without feature gate and no limit present on nodes - for _, test := range tests { - os.Setenv(KubeMaxPDVols, strconv.Itoa(test.maxVols)) - node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) - pred := NewMaxPDVolumeCountPredicate(test.filterName, - getFakeCSINodeLister(csiNode), - getFakeStorageClassLister(test.filterName), - getFakePVLister(test.filterName), - getFakePVCLister(test.filterName)) - - factory := &MetadataProducerFactory{} - fits, reasons, err := pred(test.newPod, factory.GetPredicateMetadata(test.newPod, nil), node) - if err != nil { - t.Errorf("[%s]%s: unexpected error: %v", test.filterName, test.test, err) - } - if !fits && !reflect.DeepEqual(reasons, expectedFailureReasons) { - t.Errorf("[%s]%s: unexpected failure reasons: %v, want: %v", test.filterName, test.test, reasons, expectedFailureReasons) - } - if fits != test.fits { - t.Errorf("[%s]%s: expected %v, got %v", test.filterName, test.test, test.fits, fits) - } - } - - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - // running attachable predicate tests with feature gate and limit present on nodes for _, test := range tests { node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) diff --git a/pkg/scheduler/algorithm/predicates/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go index 0354d08c9c0..c3d961ddbb9 100644 --- a/pkg/scheduler/algorithm/predicates/predicates.go +++ b/pkg/scheduler/algorithm/predicates/predicates.go @@ -477,11 +477,9 @@ func (c *MaxPDVolumeCountChecker) predicate(pod *v1.Pod, meta Metadata, nodeInfo numNewVolumes := len(newVolumes) maxAttachLimit := c.maxVolumeFunc(node) - if utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - volumeLimits := nodeInfo.VolumeLimits() - if maxAttachLimitFromAllocatable, ok := volumeLimits[c.volumeLimitKey]; ok { - maxAttachLimit = int(maxAttachLimitFromAllocatable) - } + volumeLimits := nodeInfo.VolumeLimits() + if maxAttachLimitFromAllocatable, ok := volumeLimits[c.volumeLimitKey]; ok { + maxAttachLimit = int(maxAttachLimitFromAllocatable) } if numExistingVolumes+numNewVolumes > maxAttachLimit { diff --git a/pkg/scheduler/apis/config/testing/compatibility_test.go b/pkg/scheduler/apis/config/testing/compatibility_test.go index 5fc6e1a39e7..53d5e4a8e9c 100644 --- a/pkg/scheduler/apis/config/testing/compatibility_test.go +++ b/pkg/scheduler/apis/config/testing/compatibility_test.go @@ -1169,30 +1169,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { }, }, }, - { - name: "disable beta feature AttachVolumeLimit", - JSON: `{ - "kind": "Policy", - "apiVersion": "v1", - "predicates": [ - {"name": "MaxCSIVolumeCountPred"}, - {"name": "CheckVolumeBinding"} - ], - "priorities": [ - ] - }`, - featureGates: map[featuregate.Feature]bool{ - features.AttachVolumeLimit: false, - }, - wantPlugins: map[string][]config.Plugin{ - "FilterPlugin": { - {Name: "NodeUnschedulable"}, - {Name: "TaintToleration"}, - {Name: "NodeVolumeLimits"}, - {Name: "VolumeBinding"}, - }, - }, - }, } registeredPredicates := sets.NewString(scheduler.ListRegisteredFitPredicates()...) registeredPriorities := sets.NewString(scheduler.ListRegisteredPriorityFunctions()...) diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/azure_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/azure_test.go index 8c97ea24374..575b9d07f35 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/azure_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/azure_test.go @@ -22,9 +22,6 @@ import ( "testing" v1 "k8s.io/api/core/v1" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) @@ -355,8 +352,6 @@ func TestAzureDiskLimits(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - for _, test := range tests { t.Run(test.test, func(t *testing.T) { node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/cinder_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/cinder_test.go index 08d197d6ba6..20ebb14de82 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/cinder_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/cinder_test.go @@ -22,9 +22,6 @@ import ( "testing" v1 "k8s.io/api/core/v1" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) @@ -84,8 +81,6 @@ func TestCinderLimits(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - for _, test := range tests { t.Run(test.test, func(t *testing.T) { node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go index 2b9479f46d6..aa975f40f39 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go @@ -447,7 +447,6 @@ func TestCSILimits(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() // running attachable predicate tests with feature gate and limit present on nodes for _, test := range tests { t.Run(test.test, func(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/ebs_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/ebs_test.go index 39c1b1dd39d..c9aa0d89557 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/ebs_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/ebs_test.go @@ -24,10 +24,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" csilibplugins "k8s.io/csi-translation-lib/plugins" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" fakelisters "k8s.io/kubernetes/pkg/scheduler/listers/fake" @@ -469,8 +466,6 @@ func TestEBSLimits(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - for _, test := range tests { t.Run(test.test, func(t *testing.T) { node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/gce_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/gce_test.go index 414426561ec..957d3cfd485 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/gce_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/gce_test.go @@ -22,9 +22,6 @@ import ( "testing" v1 "k8s.io/api/core/v1" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) @@ -355,8 +352,6 @@ func TestGCEPDLimits(t *testing.T) { }, } - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() - for _, test := range tests { t.Run(test.test, func(t *testing.T) { node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) diff --git a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go index b6f15bdd12a..b6920ba078d 100644 --- a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go +++ b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go @@ -556,17 +556,15 @@ func (nim *nodeInfoManager) installDriverToCSINode( TopologyKeys: topologyKeys.List(), } - if utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - if maxAttachLimit > 0 { - if maxAttachLimit > math.MaxInt32 { - klog.Warningf("Exceeded max supported attach limit value, truncating it to %d", math.MaxInt32) - maxAttachLimit = math.MaxInt32 - } - m := int32(maxAttachLimit) - driverSpec.Allocatable = &storagev1.VolumeNodeResources{Count: &m} - } else { - klog.Errorf("Invalid attach limit value %d cannot be added to CSINode object for %q", maxAttachLimit, driverName) + if maxAttachLimit > 0 { + if maxAttachLimit > math.MaxInt32 { + klog.Warningf("Exceeded max supported attach limit value, truncating it to %d", math.MaxInt32) + maxAttachLimit = math.MaxInt32 } + m := int32(maxAttachLimit) + driverSpec.Allocatable = &storagev1.VolumeNodeResources{Count: &m} + } else { + klog.Errorf("Invalid attach limit value %d cannot be added to CSINode object for %q", maxAttachLimit, driverName) } newDriverSpecs = append(newDriverSpecs, driverSpec) diff --git a/pkg/volume/csi/nodeinfomanager/nodeinfomanager_test.go b/pkg/volume/csi/nodeinfomanager/nodeinfomanager_test.go index 22ba95e1326..95bff7507b4 100644 --- a/pkg/volume/csi/nodeinfomanager/nodeinfomanager_test.go +++ b/pkg/volume/csi/nodeinfomanager/nodeinfomanager_test.go @@ -1011,7 +1011,6 @@ func getClientSet(existingNode *v1.Node, existingCSINode *storage.CSINode) *fake func test(t *testing.T, addNodeInfo bool, csiNodeInfoEnabled bool, testcases []testcase) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSINodeInfo, csiNodeInfoEnabled)() - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AttachVolumeLimit, true)() for _, tc := range testcases { t.Logf("test case: %q", tc.name) diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go index 2b6a0e42f47..10ba64be035 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go @@ -498,10 +498,8 @@ func ClusterRoles() []rbacv1.ClusterRole { // Needed to check API access. These creates are non-mutating rbacv1helpers.NewRule("create").Groups(authenticationGroup).Resources("tokenreviews").RuleOrDie(), rbacv1helpers.NewRule("create").Groups(authorizationGroup).Resources("subjectaccessreviews").RuleOrDie(), - } - if utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) && - utilfeature.DefaultFeatureGate.Enabled(features.AttachVolumeLimit) { - kubeSchedulerRules = append(kubeSchedulerRules, rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("csinodes").RuleOrDie()) + // Needed for volume limits + rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("csinodes").RuleOrDie(), } roles = append(roles, rbacv1.ClusterRole{ // a role to use for the kube-scheduler