diff --git a/cmd/kubenest/operator/app/operator.go b/cmd/kubenest/operator/app/operator.go index 00b0e3b40..42a3ddab5 100644 --- a/cmd/kubenest/operator/app/operator.go +++ b/cmd/kubenest/operator/app/operator.go @@ -14,7 +14,6 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog/v2" - kubeschedulerscheme "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -141,7 +140,7 @@ func loadConfig(file string) (*v1alpha1.KubeNestConfiguration, error) { return nil, err } // The UniversalDecoder runs defaulting and returns the internal type by default. - obj, gvk, err := kubeschedulerscheme.Codecs.UniversalDecoder().Decode(data, nil, nil) + obj, gvk, err := scheme.Codecs.UniversalDecoder().Decode(data, nil, nil) if err != nil { return nil, err } diff --git a/pkg/scheme/scheme.go b/pkg/scheme/scheme.go index 44b63c09b..de4e8ca5c 100644 --- a/pkg/scheme/scheme.go +++ b/pkg/scheme/scheme.go @@ -2,14 +2,20 @@ package scheme import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1" kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" ) -// aggregatedScheme aggregates Kubernetes and extended schemes. -var aggregatedScheme = runtime.NewScheme() +var ( + // aggregatedScheme aggregates Kubernetes and extended schemes. + aggregatedScheme = runtime.NewScheme() + + // Codecs provides access to encoding and decoding for the scheme. + Codecs = serializer.NewCodecFactory(aggregatedScheme, serializer.EnableStrict) +) func init() { err := scheme.AddToScheme(aggregatedScheme) // add Kubernetes schemes