Skip to content

Commit 697ed2c

Browse files
committed
support both JSON and YAML for scheduler configuration
1 parent b1829df commit 697ed2c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

pkg/scheduler/api/latest/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ go_library(
1616
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
1717
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library",
1818
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning:go_default_library",
19+
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/yaml:go_default_library",
1920
],
2021
)
2122

pkg/scheduler/api/latest/latest.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"k8s.io/apimachinery/pkg/runtime/schema"
2222
"k8s.io/apimachinery/pkg/runtime/serializer/json"
2323
"k8s.io/apimachinery/pkg/runtime/serializer/versioning"
24+
"k8s.io/apimachinery/pkg/runtime/serializer/yaml"
2425
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
2526
// Init the api v1 package
2627
_ "k8s.io/kubernetes/pkg/scheduler/api/v1"
@@ -44,10 +45,11 @@ var Codec runtime.Codec
4445

4546
func init() {
4647
jsonSerializer := json.NewSerializer(json.DefaultMetaFactory, schedulerapi.Scheme, schedulerapi.Scheme, true)
48+
serializer := yaml.NewDecodingSerializer(jsonSerializer)
4749
Codec = versioning.NewDefaultingCodecForScheme(
4850
schedulerapi.Scheme,
49-
jsonSerializer,
50-
jsonSerializer,
51+
serializer,
52+
serializer,
5153
schema.GroupVersion{Version: Version},
5254
runtime.InternalGroupVersioner,
5355
)

0 commit comments

Comments
 (0)