diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index b42bcb6eb42..25a47573529 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -790,9 +790,6 @@ const ( // Enables user specified volume attributes for persistent volumes, like iops and throughput. VolumeAttributesClass featuregate.Feature = "VolumeAttributesClass" - // owner: @cofyc - VolumeCapacityPriority featuregate.Feature = "VolumeCapacityPriority" - // owner: @ksubrmnn // // Allows kube-proxy to create DSR loadbalancers for Windows diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 46b5ad76fe4..3a111f09765 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -826,10 +826,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta}, }, - VolumeCapacityPriority: { - {Version: version.MustParse("1.21"), Default: false, PreRelease: featuregate.Alpha}, - }, - WinDSR: { {Version: version.MustParse("1.14"), Default: false, PreRelease: featuregate.Alpha}, }, diff --git a/pkg/scheduler/framework/plugins/feature/feature.go b/pkg/scheduler/framework/plugins/feature/feature.go index 2a5dff6450b..d12a930d5d8 100644 --- a/pkg/scheduler/framework/plugins/feature/feature.go +++ b/pkg/scheduler/framework/plugins/feature/feature.go @@ -23,7 +23,6 @@ type Features struct { EnableDRAPrioritizedList bool EnableDRAAdminAccess bool EnableDynamicResourceAllocation bool - EnableVolumeCapacityPriority bool EnableVolumeAttributesClass bool EnableCSIMigrationPortworx bool EnableNodeInclusionPolicyInPodTopologySpread bool diff --git a/pkg/scheduler/framework/plugins/registry.go b/pkg/scheduler/framework/plugins/registry.go index 51294c3d846..47ff5e322dd 100644 --- a/pkg/scheduler/framework/plugins/registry.go +++ b/pkg/scheduler/framework/plugins/registry.go @@ -49,7 +49,6 @@ func NewInTreeRegistry() runtime.Registry { EnableDRAPrioritizedList: feature.DefaultFeatureGate.Enabled(features.DRAPrioritizedList), EnableDRAAdminAccess: feature.DefaultFeatureGate.Enabled(features.DRAAdminAccess), EnableDynamicResourceAllocation: feature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation), - EnableVolumeCapacityPriority: feature.DefaultFeatureGate.Enabled(features.VolumeCapacityPriority), EnableVolumeAttributesClass: feature.DefaultFeatureGate.Enabled(features.VolumeAttributesClass), EnableCSIMigrationPortworx: feature.DefaultFeatureGate.Enabled(features.CSIMigrationPortworx), EnableNodeInclusionPolicyInPodTopologySpread: feature.DefaultFeatureGate.Enabled(features.NodeInclusionPolicyInPodTopologySpread), diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index c545fa1a14b..788f863bc62 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -1557,12 +1557,6 @@ lockToDefault: false preRelease: Beta version: "1.31" -- name: VolumeCapacityPriority - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "1.21" - name: WatchCacheInitializationPostStartHook versionedSpecs: - default: false