diff --git a/internal/sample-apiserver/pkg/cmd/server/start.go b/internal/sample-apiserver/pkg/cmd/server/start.go index d55daec..f6f34fc 100644 --- a/internal/sample-apiserver/pkg/cmd/server/start.go +++ b/internal/sample-apiserver/pkg/cmd/server/start.go @@ -37,7 +37,6 @@ import ( baseversion "k8s.io/component-base/version" netutils "k8s.io/utils/net" "sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/admission/wardleinitializer" - "sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/apis/wardle/v1alpha1" "sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/apiserver" clientset "sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/generated/clientset/versioned" informers "sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/generated/informers/externalversions" @@ -75,7 +74,8 @@ func NewWardleServerOptions(out, errOut io.Writer, versions ...schema.GroupVersi o := &WardleServerOptions{ RecommendedOptions: genericoptions.NewRecommendedOptions( defaultEtcdPathPrefix, - apiserver.Codecs.LegacyCodec(v1alpha1.SchemeGroupVersion), + // change: apiserver-runtime + apiserver.Codecs.LegacyCodec(versions...), ), StdOut: out, diff --git a/pkg/builder/rest/rest.go b/pkg/builder/rest/rest.go index 5c62aad..f611ae6 100644 --- a/pkg/builder/rest/rest.go +++ b/pkg/builder/rest/rest.go @@ -74,15 +74,16 @@ func newStore( gvr schema.GroupVersionResource, s Strategy, optsGetter generic.RESTOptionsGetter, fn StoreFn) (*genericregistry.Store, error) { store := &genericregistry.Store{ - NewFunc: single, - NewListFunc: list, - PredicateFunc: s.Match, - DefaultQualifiedResource: gvr.GroupResource(), - TableConvertor: s, - CreateStrategy: s, - UpdateStrategy: s, - DeleteStrategy: s, - StorageVersioner: gvr.GroupVersion(), + NewFunc: single, + NewListFunc: list, + PredicateFunc: s.Match, + DefaultQualifiedResource: gvr.GroupResource(), + SingularQualifiedResource: gvr.GroupResource(), + TableConvertor: s, + CreateStrategy: s, + UpdateStrategy: s, + DeleteStrategy: s, + StorageVersioner: gvr.GroupVersion(), } options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: GetAttrs}