From bb8dcc306310293e5b9b52c1d080edb5bacf7e09 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 9 Jul 2018 17:34:33 +0200 Subject: [PATCH] apiextensions-apiserver: wire through CountMetricPollPeriod for CRs --- .../pkg/apiserver/customresource_handler.go | 2 ++ .../apiextensions-apiserver/pkg/cmd/server/options/options.go | 1 + 2 files changed, 3 insertions(+) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go index 65eccf1166..85f5052e54 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go @@ -664,6 +664,7 @@ type CRDRESTOptionsGetter struct { DefaultWatchCacheSize int EnableGarbageCollection bool DeleteCollectionWorkers int + CountMetricPollPeriod time.Duration } func (t CRDRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) { @@ -673,6 +674,7 @@ func (t CRDRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (gen EnableGarbageCollection: t.EnableGarbageCollection, DeleteCollectionWorkers: t.DeleteCollectionWorkers, ResourcePrefix: resource.Group + "/" + resource.Resource, + CountMetricPollPeriod: t.CountMetricPollPeriod, } if t.EnableWatchCache { ret.Decorator = genericregistry.StorageWithCacher(t.DefaultWatchCacheSize) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go index 5e18ba3bdd..995a315555 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go @@ -108,6 +108,7 @@ func NewCRDRESTOptionsGetter(etcdOptions genericoptions.EtcdOptions) genericregi DefaultWatchCacheSize: etcdOptions.DefaultWatchCacheSize, EnableGarbageCollection: etcdOptions.EnableGarbageCollection, DeleteCollectionWorkers: etcdOptions.DeleteCollectionWorkers, + CountMetricPollPeriod: etcdOptions.StorageConfig.CountMetricPollPeriod, } ret.StorageConfig.Codec = unstructured.UnstructuredJSONScheme