From 548cb7f4e29030a8fd4922f0963d512dfd4dbebf Mon Sep 17 00:00:00 2001 From: Shiyang Wang Date: Thu, 7 Sep 2017 10:19:30 +0800 Subject: [PATCH] move specialDefaultResourcePrefixes out of vendor/k8s.io/apiserver Kubernetes-commit: 0084d70b56fb0b262f75f1b837001be04a694fb6 --- pkg/server/storage/storage_factory.go | 14 +------------- pkg/server/storage/storage_factory_test.go | 4 ++-- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/pkg/server/storage/storage_factory.go b/pkg/server/storage/storage_factory.go index efa445182..429e14d5c 100644 --- a/pkg/server/storage/storage_factory.go +++ b/pkg/server/storage/storage_factory.go @@ -151,19 +151,7 @@ var _ StorageFactory = &DefaultStorageFactory{} const AllResources = "*" -// specialDefaultResourcePrefixes are prefixes compiled into Kubernetes. -// TODO: move out of this package, it is not generic -var specialDefaultResourcePrefixes = map[schema.GroupResource]string{ - {Group: "", Resource: "replicationControllers"}: "controllers", - {Group: "", Resource: "replicationcontrollers"}: "controllers", - {Group: "", Resource: "endpoints"}: "services/endpoints", - {Group: "", Resource: "nodes"}: "minions", - {Group: "", Resource: "services"}: "services/specs", - {Group: "extensions", Resource: "ingresses"}: "ingress", - {Group: "extensions", Resource: "podsecuritypolicies"}: "podsecuritypolicy", -} - -func NewDefaultStorageFactory(config storagebackend.Config, defaultMediaType string, defaultSerializer runtime.StorageSerializer, resourceEncodingConfig ResourceEncodingConfig, resourceConfig APIResourceConfigSource) *DefaultStorageFactory { +func NewDefaultStorageFactory(config storagebackend.Config, defaultMediaType string, defaultSerializer runtime.StorageSerializer, resourceEncodingConfig ResourceEncodingConfig, resourceConfig APIResourceConfigSource, specialDefaultResourcePrefixes map[schema.GroupResource]string) *DefaultStorageFactory { config.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking) if len(defaultMediaType) == 0 { defaultMediaType = runtime.ContentTypeJSON diff --git a/pkg/server/storage/storage_factory_test.go b/pkg/server/storage/storage_factory_test.go index bb881fd5c..66a5aff1d 100644 --- a/pkg/server/storage/storage_factory_test.go +++ b/pkg/server/storage/storage_factory_test.go @@ -94,7 +94,7 @@ func (n *fakeNegotiater) DecoderToVersion(serializer runtime.Decoder, gv runtime func TestConfigurableStorageFactory(t *testing.T) { ns := &fakeNegotiater{types: []string{"test/test"}} - f := NewDefaultStorageFactory(storagebackend.Config{}, "test/test", ns, NewDefaultResourceEncodingConfig(registry), NewResourceConfig()) + f := NewDefaultStorageFactory(storagebackend.Config{}, "test/test", ns, NewDefaultResourceEncodingConfig(registry), NewResourceConfig(), nil) f.AddCohabitatingResources(example.Resource("test"), schema.GroupResource{Resource: "test2", Group: "2"}) called := false testEncoderChain := func(e runtime.Encoder) runtime.Encoder { @@ -147,7 +147,7 @@ func TestUpdateEtcdOverrides(t *testing.T) { ServerList: defaultEtcdLocation, Copier: scheme, } - storageFactory := NewDefaultStorageFactory(defaultConfig, "", codecs, NewDefaultResourceEncodingConfig(registry), NewResourceConfig()) + storageFactory := NewDefaultStorageFactory(defaultConfig, "", codecs, NewDefaultResourceEncodingConfig(registry), NewResourceConfig(), nil) storageFactory.SetEtcdLocation(test.resource, test.servers) var err error