Skip to content

K
k3s
Unverified Commit 5abe4cce authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67896 from deads2k/server-05-exposestorage

Automatic merge from submit-queue (batch tested with PRs 54935, 67768, 67896, 67787). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. expose generic storage factory primitives The `StorageFactory` is central to the idea of a generic and decorated storage configuration for a given resource. This pull exposes the "standard" one from the generic apiserver to allow easier composition without duplication. @kubernetes/sig-api-machinery-pr-reviews /assign @yue9944882 @sttts ```release-note NONE ```
parents 5afa23f2 81b9213a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
View file @ 5abe4cce
...@@ -192,7 +192,7 @@ func (s *EtcdOptions) ApplyWithStorageFactoryTo(factory serverstorage.StorageFac ...@@ -192,7 +192,7 @@ func (s *EtcdOptions) ApplyWithStorageFactoryTo(factory serverstorage.StorageFac
if err := s.addEtcdHealthEndpoint(c); err != nil { if err := s.addEtcdHealthEndpoint(c); err != nil {
return err return err
} }
c.RESTOptionsGetter = &storageFactoryRestOptionsFactory{Options: *s, StorageFactory: factory} c.RESTOptionsGetter = &StorageFactoryRestOptionsFactory{Options: *s, StorageFactory: factory}
return nil return nil
} }
...@@ -234,12 +234,12 @@ func (f *SimpleRestOptionsFactory) GetRESTOptions(resource schema.GroupResource) ...@@ -234,12 +234,12 @@ func (f *SimpleRestOptionsFactory) GetRESTOptions(resource schema.GroupResource)
return ret, nil return ret, nil
} }
type storageFactoryRestOptionsFactory struct { type StorageFactoryRestOptionsFactory struct {
Options EtcdOptions Options EtcdOptions
StorageFactory serverstorage.StorageFactory StorageFactory serverstorage.StorageFactory
} }
func (f *storageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) { func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) {
storageConfig, err := f.StorageFactory.NewConfig(resource) storageConfig, err := f.StorageFactory.NewConfig(resource)
if err != nil { if err != nil {
return generic.RESTOptions{}, fmt.Errorf("unable to find storage destination for %v, due to %v", resource, err.Error()) return generic.RESTOptions{}, fmt.Errorf("unable to find storage destination for %v, due to %v", resource, err.Error())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment