Skip to content

Commit

Permalink
Merge pull request #692 from duanmengkk/feature_fix_bug
Browse files Browse the repository at this point in the history
fix flags for --config
  • Loading branch information
duanmengkk committed Aug 22, 2024
2 parents ef7d4f8 + 7ce5dd6 commit c5b4e0f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
3 changes: 1 addition & 2 deletions cmd/kubenest/operator/app/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
}
Expand Down
10 changes: 8 additions & 2 deletions pkg/scheme/scheme.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c5b4e0f

Please sign in to comment.