mirror of
https://github.com/kubernetes/client-go.git
synced 2025-09-05 09:01:06 +00:00
drop deprecated json/yaml newSerializers, use json.NewSerializerWithOptions instead
Signed-off-by: liyuerich <yue.li@daocloud.io> Kubernetes-commit: 3c9309db463679c348934429d8487d190ed5e64a
This commit is contained in:
committed by
Kubernetes Publisher
parent
53c7e93bf2
commit
68d318f3aa
@@ -51,11 +51,11 @@ func (s basicNegotiatedSerializer) SupportedMediaTypes() []runtime.SerializerInf
|
|||||||
MediaTypeType: "application",
|
MediaTypeType: "application",
|
||||||
MediaTypeSubType: "json",
|
MediaTypeSubType: "json",
|
||||||
EncodesAsText: true,
|
EncodesAsText: true,
|
||||||
Serializer: json.NewSerializer(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, false),
|
Serializer: json.NewSerializerWithOptions(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, json.SerializerOptions{}),
|
||||||
PrettySerializer: json.NewSerializer(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, true),
|
PrettySerializer: json.NewSerializerWithOptions(json.DefaultMetaFactory, unstructuredCreater{basicScheme}, unstructuredTyper{basicScheme}, json.SerializerOptions{Pretty: true}),
|
||||||
StreamSerializer: &runtime.StreamSerializerInfo{
|
StreamSerializer: &runtime.StreamSerializerInfo{
|
||||||
EncodesAsText: true,
|
EncodesAsText: true,
|
||||||
Serializer: json.NewSerializer(json.DefaultMetaFactory, basicScheme, basicScheme, false),
|
Serializer: json.NewSerializerWithOptions(json.DefaultMetaFactory, basicScheme, basicScheme, json.SerializerOptions{}),
|
||||||
Framer: json.Framer,
|
Framer: json.Framer,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@@ -37,7 +37,7 @@ import (
|
|||||||
|
|
||||||
// getDecoder mimics how k8s.io/client-go/rest.createSerializers creates a decoder
|
// getDecoder mimics how k8s.io/client-go/rest.createSerializers creates a decoder
|
||||||
func getDecoder() runtime.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()
|
directCodecFactory := scheme.Codecs.WithoutConversion()
|
||||||
return directCodecFactory.DecoderToVersion(jsonSerializer, v1.SchemeGroupVersion)
|
return directCodecFactory.DecoderToVersion(jsonSerializer, v1.SchemeGroupVersion)
|
||||||
}
|
}
|
||||||
|
@@ -34,7 +34,7 @@ import (
|
|||||||
|
|
||||||
// getEncoder mimics how k8s.io/client-go/rest.createSerializers creates a encoder
|
// getEncoder mimics how k8s.io/client-go/rest.createSerializers creates a encoder
|
||||||
func getEncoder() runtime.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()
|
directCodecFactory := scheme.Codecs.WithoutConversion()
|
||||||
return directCodecFactory.EncoderForVersion(jsonSerializer, v1.SchemeGroupVersion)
|
return directCodecFactory.EncoderForVersion(jsonSerializer, v1.SchemeGroupVersion)
|
||||||
}
|
}
|
||||||
|
@@ -50,7 +50,7 @@ func init() {
|
|||||||
Scheme = runtime.NewScheme()
|
Scheme = runtime.NewScheme()
|
||||||
utilruntime.Must(api.AddToScheme(Scheme))
|
utilruntime.Must(api.AddToScheme(Scheme))
|
||||||
utilruntime.Must(v1.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(
|
Codec = versioning.NewDefaultingCodecForScheme(
|
||||||
Scheme,
|
Scheme,
|
||||||
yamlSerializer,
|
yamlSerializer,
|
||||||
|
Reference in New Issue
Block a user