github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

apiextensions-apiserver: wire through CountMetricPollPeriod for CRs

pull/8/head
Dr. Stefan Schimanski 2018-07-09 17:34:33 +02:00
parent 5232ad4a00
commit bb8dcc3063
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
View File

@ -664,6 +664,7 @@ type CRDRESTOptionsGetter struct {
DefaultWatchCacheSize int DefaultWatchCacheSize int
EnableGarbageCollection bool EnableGarbageCollection bool
DeleteCollectionWorkers int DeleteCollectionWorkers int
CountMetricPollPeriod time.Duration
} }
func (t CRDRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) { 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, EnableGarbageCollection: t.EnableGarbageCollection,
DeleteCollectionWorkers: t.DeleteCollectionWorkers, DeleteCollectionWorkers: t.DeleteCollectionWorkers,
ResourcePrefix: resource.Group + "/" + resource.Resource, ResourcePrefix: resource.Group + "/" + resource.Resource,
CountMetricPollPeriod: t.CountMetricPollPeriod,
} }
if t.EnableWatchCache { if t.EnableWatchCache {
ret.Decorator = genericregistry.StorageWithCacher(t.DefaultWatchCacheSize) ret.Decorator = genericregistry.StorageWithCacher(t.DefaultWatchCacheSize)

1
staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go
View File

@ -108,6 +108,7 @@ func NewCRDRESTOptionsGetter(etcdOptions genericoptions.EtcdOptions) genericregi
DefaultWatchCacheSize: etcdOptions.DefaultWatchCacheSize, DefaultWatchCacheSize: etcdOptions.DefaultWatchCacheSize,
EnableGarbageCollection: etcdOptions.EnableGarbageCollection, EnableGarbageCollection: etcdOptions.EnableGarbageCollection,
DeleteCollectionWorkers: etcdOptions.DeleteCollectionWorkers, DeleteCollectionWorkers: etcdOptions.DeleteCollectionWorkers,
CountMetricPollPeriod: etcdOptions.StorageConfig.CountMetricPollPeriod,
} }
ret.StorageConfig.Codec = unstructured.UnstructuredJSONScheme ret.StorageConfig.Codec = unstructured.UnstructuredJSONScheme