diff --git a/pkg/api/register.go b/pkg/api/register.go index de1ff9613..5521b5384 100644 --- a/pkg/api/register.go +++ b/pkg/api/register.go @@ -19,8 +19,6 @@ package api import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - - "sigs.k8s.io/descheduler/pkg/descheduler/scheme" ) var ( @@ -35,12 +33,6 @@ const GroupName = "descheduler" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} -func init() { - if err := addKnownTypes(scheme.Scheme); err != nil { - panic(err) - } -} - // Kind takes an unqualified kind and returns a Group qualified GroupKind func Kind(kind string) schema.GroupKind { return SchemeGroupVersion.WithKind(kind).GroupKind() diff --git a/pkg/apis/componentconfig/register.go b/pkg/apis/componentconfig/register.go index 05d1a5903..b16d486b3 100644 --- a/pkg/apis/componentconfig/register.go +++ b/pkg/apis/componentconfig/register.go @@ -19,8 +19,6 @@ package componentconfig import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - - "sigs.k8s.io/descheduler/pkg/descheduler/scheme" ) var ( @@ -34,12 +32,6 @@ const GroupName = "deschedulercomponentconfig" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} -func init() { - if err := addKnownTypes(scheme.Scheme); err != nil { - panic(err) - } -} - // Kind takes an unqualified kind and returns a Group qualified GroupKind func Kind(kind string) schema.GroupKind { return SchemeGroupVersion.WithKind(kind).GroupKind() diff --git a/pkg/descheduler/scheme/scheme.go b/pkg/descheduler/scheme/scheme.go index bf9501d7f..2949193c1 100644 --- a/pkg/descheduler/scheme/scheme.go +++ b/pkg/descheduler/scheme/scheme.go @@ -19,9 +19,22 @@ package scheme import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "sigs.k8s.io/descheduler/pkg/api" + "sigs.k8s.io/descheduler/pkg/api/v1alpha1" + "sigs.k8s.io/descheduler/pkg/apis/componentconfig" + componentconfigv1alpha1 "sigs.k8s.io/descheduler/pkg/apis/componentconfig/v1alpha1" ) var ( Scheme = runtime.NewScheme() Codecs = serializer.NewCodecFactory(Scheme) ) + +func init() { + utilruntime.Must(api.AddToScheme(Scheme)) + utilruntime.Must(v1alpha1.AddToScheme(Scheme)) + + utilruntime.Must(componentconfig.AddToScheme(Scheme)) + utilruntime.Must(componentconfigv1alpha1.AddToScheme(Scheme)) +}