Skip to content

Commit 587ce02

Browse files
chenk008wuhua.ck
authored andcommitted
prioritize user EtcdOptions.StorageConfig.StorageObjectCountTracker
1 parent 4abc2b3 commit 587ce02

File tree

1 file changed

+5
-1
lines changed
  • staging/src/k8s.io/apiserver/pkg/server/options

1 file changed

+5
-1
lines changed

staging/src/k8s.io/apiserver/pkg/server/options/etcd.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,11 @@ func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupR
396396
EnableGarbageCollection: f.Options.EnableGarbageCollection,
397397
ResourcePrefix: f.StorageFactory.ResourcePrefix(resource),
398398
CountMetricPollPeriod: f.Options.StorageConfig.CountMetricPollPeriod,
399-
StorageObjectCountTracker: storageConfig.StorageObjectCountTracker,
399+
StorageObjectCountTracker: f.Options.StorageConfig.StorageObjectCountTracker,
400+
}
401+
402+
if ret.StorageObjectCountTracker == nil {
403+
ret.StorageObjectCountTracker = storageConfig.StorageObjectCountTracker
400404
}
401405

402406
if f.Options.EnableWatchCache {

0 commit comments

Comments
 (0)