From 68d318f3aa6ff22d77ec76039ee8bf023cc6b013 Mon Sep 17 00:00:00 2001 From: liyuerich Date: Wed, 29 May 2024 19:00:00 +0800 Subject: [PATCH] drop deprecated json/yaml newSerializers, use json.NewSerializerWithOptions instead Signed-off-by: liyuerich Kubernetes-commit: 3c9309db463679c348934429d8487d190ed5e64a --- dynamic/scheme.go | 6 +++--- rest/watch/decoder_test.go | 2 +- rest/watch/encoder_test.go | 2 +- tools/clientcmd/api/latest/latest.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dynamic/scheme.go b/dynamic/scheme.go index 3168c872..d5c4f80b 100644 --- a/dynamic/scheme.go +++ b/dynamic/scheme.go @@ -51,11 +51,11 @@ func (s basicNegotiatedSerializer) SupportedMediaTypes() []runtime.SerializerInf MediaTypeType: "application", MediaTypeSubType: "json", EncodesAsText: true, - Serializer: json.NewSerializer(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, false), - PrettySerializer: json.NewSerializer(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, true), + Serializer: json.NewSerializerWithOptions(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, json.SerializerOptions{}), + PrettySerializer: json.NewSerializerWithOptions(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, json.SerializerOptions{Pretty: true}), StreamSerializer: &runtime.StreamSerializerInfo{ EncodesAsText: true, - Serializer: json.NewSerializer(json.DefaultMetaFactory, basicScheme, basicScheme, false), + Serializer: json.NewSerializerWithOptions(json.DefaultMetaFactory, basicScheme, basicScheme, json.SerializerOptions{}), Framer: json.Framer, }, }, diff --git a/rest/watch/decoder_test.go b/rest/watch/decoder_test.go index 8623ce42..8d533f0b 100644 --- a/rest/watch/decoder_test.go +++ b/rest/watch/decoder_test.go @@ -37,7 +37,7 @@ import ( // getDecoder mimics how k8s.io/client-go/rest.createSerializers creates a decoder func getDecoder() runtime.Decoder { - jsonSerializer := runtimejson.NewSerializer(runtimejson.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, false) + jsonSerializer := runtimejson.NewSerializerWithOptions(runtimejson.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, runtimejson.SerializerOptions{}) directCodecFactory := scheme.Codecs.WithoutConversion() return directCodecFactory.DecoderToVersion(jsonSerializer, v1.SchemeGroupVersion) } diff --git a/rest/watch/encoder_test.go b/rest/watch/encoder_test.go index da182b1b..3d36a6df 100644 --- a/rest/watch/encoder_test.go +++ b/rest/watch/encoder_test.go @@ -34,7 +34,7 @@ import ( // getEncoder mimics how k8s.io/client-go/rest.createSerializers creates a encoder func getEncoder() runtime.Encoder { - jsonSerializer := runtimejson.NewSerializer(runtimejson.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, false) + jsonSerializer := runtimejson.NewSerializerWithOptions(runtimejson.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, runtimejson.SerializerOptions{}) directCodecFactory := scheme.Codecs.WithoutConversion() return directCodecFactory.EncoderForVersion(jsonSerializer, v1.SchemeGroupVersion) } diff --git a/tools/clientcmd/api/latest/latest.go b/tools/clientcmd/api/latest/latest.go index 35bb5dde..c575652b 100644 --- a/tools/clientcmd/api/latest/latest.go +++ b/tools/clientcmd/api/latest/latest.go @@ -50,7 +50,7 @@ func init() { Scheme = runtime.NewScheme() utilruntime.Must(api.AddToScheme(Scheme)) utilruntime.Must(v1.AddToScheme(Scheme)) - yamlSerializer := json.NewYAMLSerializer(json.DefaultMetaFactory, Scheme, Scheme) + yamlSerializer := json.NewSerializerWithOptions(json.DefaultMetaFactory, Scheme, Scheme, json.SerializerOptions{Yaml: true}) Codec = versioning.NewDefaultingCodecForScheme( Scheme, yamlSerializer,