Skip to content

Commit

Permalink
fixes storage type assertion
Browse files Browse the repository at this point in the history
Signed-off-by: yue9944882 <291271447@qq.com>
  • Loading branch information
yue9944882 committed Feb 9, 2022
1 parent c85db35 commit a40af94
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions pkg/builder/rest/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
Expand Down Expand Up @@ -54,8 +53,8 @@ func (p ParentStaticHandlerProvider) Get(s *runtime.Scheme, g generic.RESTOption
if err != nil {
return nil, err
}
getter, isGetter := parentStorage.(rest.Getter)
updater, isUpdater := parentStorage.(rest.Updater)
getter, isGetter := p.Storage.(rest.Getter)
updater, isUpdater := p.Storage.(rest.Updater)
switch {
case isGetter && isUpdater:
return parentPlumbedStorageGetterUpdaterProvider{
Expand All @@ -80,10 +79,10 @@ type parentPlumbedStorageGetterProvider struct {
}

func (p parentPlumbedStorageGetterProvider) New() runtime.Object {
return p.delegate.(rest.Storage).New()
return p.parentStorage.New()
}

func (p parentPlumbedStorageGetterProvider) Get(ctx context.Context, name string, options *v1.GetOptions) (runtime.Object, error) {
func (p parentPlumbedStorageGetterProvider) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
return p.delegate.Get(contextutil.WithParentStorage(ctx, p.parentStorage), name, options)
}

Expand All @@ -97,10 +96,10 @@ type parentPlumbedStorageGetterUpdaterProvider struct {
}

func (p parentPlumbedStorageGetterUpdaterProvider) New() runtime.Object {
return p.parentStorage.(rest.Storage).New()
return p.parentStorage.New()
}

func (p parentPlumbedStorageGetterUpdaterProvider) Get(ctx context.Context, name string, options *v1.GetOptions) (runtime.Object, error) {
func (p parentPlumbedStorageGetterUpdaterProvider) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
return p.getter.Get(contextutil.WithParentStorage(ctx, p.parentStorage), name, options)
}

Expand Down

0 comments on commit a40af94

Please sign in to comment.