From 587ce02d90f3c1e1bb7418753009baf63f6039b7 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 --- staging/src/k8s.io/apiserver/pkg/server/options/etcd.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go index a3516cf8805..10f9775efcc 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go +++ b/staging/src/k8s.io/apiserver/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 {