kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129470 from hbostan/automated-cherry-pick-of-#124223-upstream-release-1.29 

Automated cherry pick of #124223: Fix: EtcdOptions.StorageObjectCountTracker is nil, APF estimator got ObjectCountNotFoundErr

Kubernetes-commit: 34ae597c19871e2d9a615fb51871c6303b62609a
This commit is contained in:
Kubernetes Publisher 2025-01-28 05:09:24 -08:00
parent 4209cb4f51 fd9b3f5fa3
commit cb526b9a19
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/options/etcd.go
View File

@ -399,6 +399,10 @@ func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupR
StorageObjectCountTracker: f.Options.StorageConfig.StorageObjectCountTracker,
}
if ret.StorageObjectCountTracker == nil {
ret.StorageObjectCountTracker = storageConfig.StorageObjectCountTracker
}
if f.Options.EnableWatchCache {
sizes, err := ParseWatchCacheSizes(f.Options.WatchCacheSizes)
if err != nil {

15
pkg/server/options/etcd_test.go
View File

@ -430,3 +430,18 @@ func healthChecksAreEqual(t *testing.T, want []string, healthChecks []healthz.He
t.Errorf("%s checks are not equal, missing=%q, extra=%q", checkerType, wantSet.Difference(gotSet).List(), gotSet.Difference(wantSet).List())
}
}
func TestRestOptionsStorageObjectCountTracker(t *testing.T) {
serverConfig := server.NewConfig(codecs)
etcdOptions := &EtcdOptions{}
if err := etcdOptions.ApplyTo(serverConfig); err != nil {
t.Fatalf("Failed to apply etcd options error: %v", err)
}
restOptions, err := serverConfig.RESTOptionsGetter.GetRESTOptions(schema.GroupResource{Group: "", Resource: ""})
if err != nil {
t.Fatal(err)
}
if restOptions.StorageConfig.StorageObjectCountTracker != serverConfig.StorageObjectCountTracker {
t.Errorf("There are different StorageObjectCountTracker in restOptions and serverConfig")
}
}