github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.31

Browse Source
This commit is contained in:
Kubernetes Release Robot
2024-07-31 16:46:34 +00:00
parent f72233c6f0 eb729d1db7
commit 8855ca830f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/features/kube_features.go
View File

@@ -1264,7 +1264,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
genericfeatures.AuthorizeWithSelectors: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.AuthorizeWithSelectors: {Default: false, PreRelease: featuregate.Alpha},
genericfeatures.ConsistentListFromCache: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.ConsistentListFromCache: {Default: true, PreRelease: featuregate.Beta},
genericfeatures.CoordinatedLeaderElection: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.CoordinatedLeaderElection: {Default: false, PreRelease: featuregate.Alpha},

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

@@ -312,6 +312,7 @@ const (
// owner: @serathius // owner: @serathius
// kep: http://kep.k8s.io/2340 // kep: http://kep.k8s.io/2340
// alpha: v1.28 // alpha: v1.28
// beta: v1.31
// //
// Allow the API server to serve consistent lists from cache // Allow the API server to serve consistent lists from cache
ConsistentListFromCache featuregate.Feature = "ConsistentListFromCache" ConsistentListFromCache featuregate.Feature = "ConsistentListFromCache"
@@ -414,7 +415,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
WatchList: {Default: false, PreRelease: featuregate.Alpha}, WatchList: {Default: false, PreRelease: featuregate.Alpha},
ConsistentListFromCache: {Default: false, PreRelease: featuregate.Alpha}, ConsistentListFromCache: {Default: true, PreRelease: featuregate.Beta},
ZeroLimitedNominalConcurrencyShares: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 ZeroLimitedNominalConcurrencyShares: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
} }