Merge pull request kubernetes#123513 from serathius/default

Move ConsistentListFromCache to Beta default

Author: k8s-ci-robot

pkg/features/kube_features.go

@@ -1215,7 +1215,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 
 	genericfeatures.APIServingWithRoutine: {Default: true, PreRelease: featuregate.Beta},
 
-	genericfeatures.ConsistentListFromCache: {Default: false, PreRelease: featuregate.Alpha},
+	genericfeatures.ConsistentListFromCache: {Default: true, PreRelease: featuregate.Beta},
 
 	genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31
 

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

@@ -305,6 +305,7 @@ const (
 	// owner: @serathius
 	// kep: http://kep.k8s.io/2340
 	// alpha: v1.28
+	// beta: v1.31
 	//
 	// Allow the API server to serve consistent lists from cache
 	ConsistentListFromCache featuregate.Feature = "ConsistentListFromCache"
@@ -392,7 +393,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 
 	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
 }

staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go

@@ -285,6 +285,7 @@ func testGetListCacheBypass(t *testing.T, options storage.ListOptions, expectByp
 }
 
 func TestGetListNonRecursiveCacheBypass(t *testing.T) {
+	featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, false)
 	backingStorage := &dummyStorage{}
 	cacher, _, err := newTestCacher(backingStorage)
 	if err != nil {

test/integration/apiserver/tracing/tracing_test.go

@@ -562,38 +562,6 @@ endpoint: %s`, listener.Addr().String())), os.FileMode(0755)); err != nil {
 						"Writing http response done",
 					},
 				},
-				{
-					name: "List(recursive=true) etcd3",
-					attributes: map[string]func(*commonv1.AnyValue) bool{
-						"audit-id": func(v *commonv1.AnyValue) bool {
-							return v.GetStringValue() != ""
-						},
-						"key": func(v *commonv1.AnyValue) bool {
-							return v.GetStringValue() == "/minions"
-						},
-						"resourceVersion": func(v *commonv1.AnyValue) bool {
-							return v.GetStringValue() == ""
-						},
-						"resourceVersionMatch": func(v *commonv1.AnyValue) bool {
-							return v.GetStringValue() == ""
-						},
-						"limit": func(v *commonv1.AnyValue) bool {
-							return v.GetIntValue() == 0
-						},
-						"continue": func(v *commonv1.AnyValue) bool {
-							return v.GetStringValue() == ""
-						},
-					},
-				},
-				{
-					name: "etcdserverpb.KV/Range",
-					attributes: map[string]func(*commonv1.AnyValue) bool{
-						"rpc.system": func(v *commonv1.AnyValue) bool {
-							return v.GetStringValue() == "grpc"
-						},
-					},
-					events: []string{"message"},
-				},
 				{
 					name: "SerializeObject",
 					attributes: map[string]func(*commonv1.AnyValue) bool{