UPSTREAM: <carry>: fallback for consistent reads from cache only if R…

…esilientWatchCacheInitialization is enabled
openshift · Sep 19, 2024 · 17575c0 · 17575c0
1 parent 9bf64d5
commit 17575c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go
@@ -848,7 +848,10 @@ func (c *Cacher) GetList(ctx context.Context, key string, opts storage.ListOptio
 		preparedKey += "/"
 	}
 	requestWatchProgressSupported := etcdfeature.DefaultFeatureSupportChecker.Supports(storage.RequestWatchProgress)
-	consistentRead := resourceVersion == "" && utilfeature.DefaultFeatureGate.Enabled(features.ConsistentListFromCache) && requestWatchProgressSupported
+	consistentRead := resourceVersion == "" &&
+		utilfeature.DefaultFeatureGate.Enabled(features.ConsistentListFromCache) &&
+		utilfeature.DefaultFeatureGate.Enabled(features.ResilientWatchCacheInitialization) &&
+		requestWatchProgressSupported
 	if consistentRead {
 		listRV, err = storage.GetCurrentResourceVersionFromStorage(ctx, c.storage, c.newListFunc, c.resourcePrefix, c.objectType.String())
 		if err != nil {

diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go
@@ -360,6 +360,7 @@ apiserver_watch_cache_consistent_read_total{fallback="true", resource="pods", su
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
 			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, tc.consistentReadsEnabled)
+			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ResilientWatchCacheInitialization, true)
 			if tc.consistentReadsEnabled {
 				forceRequestWatchProgressSupport(t)
 			}