From f687e45ec2e34dc2088181ee41977d0af8a5dc93 Mon Sep 17 00:00:00 2001 From: chenk008 Date: Thu, 18 Apr 2024 23:02:16 +0800 Subject: [PATCH] prioritize user EtcdOptions.StorageConfig.StorageObjectCountTracker Kubernetes-commit: 587ce02d90f3c1e1bb7418753009baf63f6039b7 --- pkg/server/options/etcd.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/server/options/etcd.go b/pkg/server/options/etcd.go index a3516cf88..10f9775ef 100644 --- a/pkg/server/options/etcd.go +++ b/pkg/server/options/etcd.go @@ -396,7 +396,11 @@ func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupR EnableGarbageCollection: f.Options.EnableGarbageCollection, ResourcePrefix: f.StorageFactory.ResourcePrefix(resource), CountMetricPollPeriod: f.Options.StorageConfig.CountMetricPollPeriod, - StorageObjectCountTracker: storageConfig.StorageObjectCountTracker, + StorageObjectCountTracker: f.Options.StorageConfig.StorageObjectCountTracker, + } + + if ret.StorageObjectCountTracker == nil { + ret.StorageObjectCountTracker = storageConfig.StorageObjectCountTracker } if f.Options.EnableWatchCache {