From 697ed2cc2ae44279ca7e7bce985802988942a252 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Fri, 29 Mar 2019 09:35:29 +0800 Subject: [PATCH] support both JSON and YAML for scheduler configuration --- pkg/scheduler/api/latest/BUILD | 1 + pkg/scheduler/api/latest/latest.go | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/scheduler/api/latest/BUILD b/pkg/scheduler/api/latest/BUILD index 97cf4626bc..65b4db771a 100644 --- a/pkg/scheduler/api/latest/BUILD +++ b/pkg/scheduler/api/latest/BUILD @@ -16,6 +16,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/yaml:go_default_library", ], ) diff --git a/pkg/scheduler/api/latest/latest.go b/pkg/scheduler/api/latest/latest.go index 97696d57be..f4a4ff7adc 100644 --- a/pkg/scheduler/api/latest/latest.go +++ b/pkg/scheduler/api/latest/latest.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/versioning" + "k8s.io/apimachinery/pkg/runtime/serializer/yaml" schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" // Init the api v1 package _ "k8s.io/kubernetes/pkg/scheduler/api/v1" @@ -44,10 +45,11 @@ var Codec runtime.Codec func init() { jsonSerializer := json.NewSerializer(json.DefaultMetaFactory, schedulerapi.Scheme, schedulerapi.Scheme, true) + serializer := yaml.NewDecodingSerializer(jsonSerializer) Codec = versioning.NewDefaultingCodecForScheme( schedulerapi.Scheme, - jsonSerializer, - jsonSerializer, + serializer, + serializer, schema.GroupVersion{Version: Version}, runtime.InternalGroupVersioner, )