github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110227 from aojea/cleanup

Browse Source 
Cleanup feature gate check for SelectorIndex
This commit is contained in:
Kubernetes Prow Robot 2022-05-26 14:09:55 -07:00 committed by GitHub
commit 32c3fb3b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/core/pod/strategy.go
View File

@ -35,11 +35,9 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
genericfeatures "k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage/names" "k8s.io/apiserver/pkg/storage/names"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
podutil "k8s.io/kubernetes/pkg/api/pod" podutil "k8s.io/kubernetes/pkg/api/pod"
@ -293,12 +291,9 @@ func NodeNameIndexFunc(obj interface{}) ([]string, error) {
// Indexers returns the indexers for pod storage. // Indexers returns the indexers for pod storage.
func Indexers() *cache.Indexers { func Indexers() *cache.Indexers {
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.SelectorIndex) {
return &cache.Indexers{ return &cache.Indexers{
storage.FieldIndex("spec.nodeName"): NodeNameIndexFunc, storage.FieldIndex("spec.nodeName"): NodeNameIndexFunc,
} }
}
return nil
} }
// ToSelectableFields returns a field set that represents the object // ToSelectableFields returns a field set that represents the object

10
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View File

@ -139,14 +139,6 @@ const (
// Deprecates and removes SelfLink from ObjectMeta and ListMeta. // Deprecates and removes SelfLink from ObjectMeta and ListMeta.
RemoveSelfLink featuregate.Feature = "RemoveSelfLink" RemoveSelfLink featuregate.Feature = "RemoveSelfLink"
// owner: @shaloulcy, @wojtek-t
// alpha: v1.18
// beta: v1.19
// GA: v1.20
//
// Allows label and field based indexes in apiserver watch cache to accelerate list operations.
SelectorIndex featuregate.Feature = "SelectorIndex"
// owner: @apelisse, @lavalamp // owner: @apelisse, @lavalamp
// alpha: v1.14 // alpha: v1.14
// beta: v1.16 // beta: v1.16
@ -219,8 +211,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
RemoveSelfLink: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, RemoveSelfLink: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
SelectorIndex: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
ServerSideApply: {Default: true, PreRelease: featuregate.GA}, ServerSideApply: {Default: true, PreRelease: featuregate.GA},
ServerSideFieldValidation: {Default: false, PreRelease: featuregate.Alpha}, ServerSideFieldValidation: {Default: false, PreRelease: featuregate.Alpha},