github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118125 from humblec/json-serializerwithoptions

Browse Source 
test/e2e: Use json.NewSerializerWithOptions in place of json/yaml newSerializers
This commit is contained in:
Kubernetes Prow Robot 2023-05-22 07:12:32 -07:00 committed by GitHub
commit da0a1a05b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/agnhost/VERSION
View File

@ -1 +1 @@
2.44
2.45

2
test/images/agnhost/audit-proxy/main.go
View File

@ -48,7 +48,7 @@ var (
func main(cmd *cobra.Command, args []string) {
scheme := runtime.NewScheme()
auditinstall.Install(scheme)
serializer := json.NewSerializer(json.DefaultMetaFactory, scheme, scheme, false)
serializer := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{Pretty: false})
encoder = audit.Codecs.EncoderForVersion(serializer, auditv1.SchemeGroupVersion)
decoder = audit.Codecs.UniversalDecoder(auditv1.SchemeGroupVersion)

2
test/images/agnhost/crd-conversion-webhook/converter/converter_test.go
View File

@ -92,7 +92,7 @@ request:
return
}
yamlSerializer := json.NewYAMLSerializer(json.DefaultMetaFactory, scheme, scheme)
yamlSerializer := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{Yaml: true})
if _, _, err := yamlSerializer.Decode(response.Body.Bytes(), nil, &convertReview); err != nil {
t.Fatalf("cannot decode data: \n %v\n Error: %v", response.Body, err)
}

4
test/images/agnhost/crd-conversion-webhook/converter/framework.go
View File

@ -216,8 +216,8 @@ func addToScheme(scheme *runtime.Scheme) {
}
var serializers = map[mediaType]runtime.Serializer{
{"application", "json"}: json.NewSerializer(json.DefaultMetaFactory, scheme, scheme, false),
{"application", "yaml"}: json.NewYAMLSerializer(json.DefaultMetaFactory, scheme, scheme),
{"application", "json"}: json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{Pretty: false}),
{"application", "yaml"}: json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{Yaml: true}),
}
func getInputSerializer(contentType string) runtime.Serializer {