Skip to content

Commit a40af94

Browse files
committed
fixes storage type assertion
Signed-off-by: yue9944882 <[email protected]>
1 parent c85db35 commit a40af94

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

pkg/builder/rest/provider.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121

2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/runtime"
2524
"k8s.io/apiserver/pkg/registry/generic"
2625
"k8s.io/apiserver/pkg/registry/rest"
@@ -54,8 +53,8 @@ func (p ParentStaticHandlerProvider) Get(s *runtime.Scheme, g generic.RESTOption
5453
if err != nil {
5554
return nil, err
5655
}
57-
getter, isGetter := parentStorage.(rest.Getter)
58-
updater, isUpdater := parentStorage.(rest.Updater)
56+
getter, isGetter := p.Storage.(rest.Getter)
57+
updater, isUpdater := p.Storage.(rest.Updater)
5958
switch {
6059
case isGetter && isUpdater:
6160
return parentPlumbedStorageGetterUpdaterProvider{
@@ -80,10 +79,10 @@ type parentPlumbedStorageGetterProvider struct {
8079
}
8180

8281
func (p parentPlumbedStorageGetterProvider) New() runtime.Object {
83-
return p.delegate.(rest.Storage).New()
82+
return p.parentStorage.New()
8483
}
8584

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

@@ -97,10 +96,10 @@ type parentPlumbedStorageGetterUpdaterProvider struct {
9796
}
9897

9998
func (p parentPlumbedStorageGetterUpdaterProvider) New() runtime.Object {
100-
return p.parentStorage.(rest.Storage).New()
99+
return p.parentStorage.New()
101100
}
102101

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

0 commit comments

Comments
 (0)