github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47432 from deads2k/crd-13-gc-off

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47204, 46808, 47432, 47400, 47099)

disable GC for custom resources

xref https://github.com/kubernetes/kubernetes/issues/47431

This prevents GC on CustomResources so you don't get an uncleared finalizer that prevents deletion
This commit is contained in:
Kubernetes Submit Queue 2017-06-14 17:13:58 -07:00 committed by GitHub
commit d2eb68c4a5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go
View File

@ -105,11 +105,13 @@ func (o CustomResourceDefinitionsServerOptions) Config() (*apiserver.Config, err
func NewCRDRESTOptionsGetter(etcdOptions genericoptions.EtcdOptions) genericregistry.RESTOptionsGetter { func NewCRDRESTOptionsGetter(etcdOptions genericoptions.EtcdOptions) genericregistry.RESTOptionsGetter {
ret := apiserver.CRDRESTOptionsGetter{ ret := apiserver.CRDRESTOptionsGetter{
StorageConfig: etcdOptions.StorageConfig, StorageConfig: etcdOptions.StorageConfig,
StoragePrefix: etcdOptions.StorageConfig.Prefix, StoragePrefix: etcdOptions.StorageConfig.Prefix,
EnableWatchCache: etcdOptions.EnableWatchCache, EnableWatchCache: etcdOptions.EnableWatchCache,
DefaultWatchCacheSize: etcdOptions.DefaultWatchCacheSize, DefaultWatchCacheSize: etcdOptions.DefaultWatchCacheSize,
EnableGarbageCollection: etcdOptions.EnableGarbageCollection, // garbage collection for custom resources is forced off until GC works with CRs.
// When GC is enabled, this turns back into etcdOptions.EnableGarbageCollection
EnableGarbageCollection: false,
DeleteCollectionWorkers: etcdOptions.DeleteCollectionWorkers, DeleteCollectionWorkers: etcdOptions.DeleteCollectionWorkers,
} }
ret.StorageConfig.Codec = unstructured.UnstructuredJSONScheme ret.StorageConfig.Codec = unstructured.UnstructuredJSONScheme