Allow using JSON/YAML serializer

kmodules · Mar 20, 2018 · f7912a2 · f7912a2
1 parent 2766d07
commit f7912a2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/admission/v1beta1/generic.go b/admission/v1beta1/generic.go
@@ -84,6 +84,8 @@ func (h *GenericWebhook) Admit(req *v1beta1.AdmissionRequest) *v1beta1.Admission
 	}
 
 	codec := versioning.NewDefaultingCodecForScheme(
+		versioning.JSONSerializer,
+		versioning.JSONSerializer,
 		legacyscheme.Scheme,
 		legacyscheme.Scheme,
 		schema.GroupVersion{Group: req.Kind.Group, Version: req.Kind.Version},

diff --git a/admission/v1beta1/workload.go b/admission/v1beta1/workload.go
@@ -88,7 +88,7 @@ func (h *WorkloadWebhook) Admit(req *v1beta1.AdmissionRequest) *v1beta1.Admissio
 		return StatusUninitialized()
 	}
 
-	codec := versioning.Serializer
+	codec := versioning.JSONSerializer
 	gvk := schema.GroupVersionKind{Group: req.Kind.Group, Version: req.Kind.Version, Kind: req.Kind.Kind}
 
 	switch req.Operation {

diff --git a/runtime/serializer/versioning/codec.go b/runtime/serializer/versioning/codec.go
@@ -15,7 +15,7 @@ import (
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 
-var Serializer = func() runtime.Codec {
+var JSONSerializer = func() runtime.Codec {
 	mediaType := "application/json"
 	info, ok := runtime.SerializerInfoForMediaType(legacyscheme.Codecs.SupportedMediaTypes(), mediaType)
 	if !ok {
@@ -24,7 +24,18 @@ var Serializer = func() runtime.Codec {
 	return info.Serializer
 }()
 
+var YAMLSerializer = func() runtime.Codec {
+	mediaType := "application/yaml"
+	info, ok := runtime.SerializerInfoForMediaType(legacyscheme.Codecs.SupportedMediaTypes(), mediaType)
+	if !ok {
+		panic("unsupported media type " + mediaType)
+	}
+	return info.Serializer
+}()
+
 type codec struct {
+	encoder runtime.Encoder
+	decoder runtime.Decoder
 	scheme        *runtime.Scheme
 	defaulter     runtime.ObjectDefaulter
 	encodeVersion schema.GroupVersion
@@ -33,12 +44,16 @@ type codec struct {
 
 // NewDefaultingCodecForScheme is a convenience method for callers that are using a scheme.
 func NewDefaultingCodecForScheme(
+	encoder runtime.Encoder,
+	decoder runtime.Decoder,
 	scheme *runtime.Scheme,
 	defaulter runtime.ObjectDefaulter,
 	encodeVersion schema.GroupVersion,
 	decodeVersion schema.GroupVersion,
 ) runtime.Codec {
 	return codec{
+		encoder:   encoder,
+		decoder:   decoder,
 		scheme:        scheme,
 		defaulter:     defaulter,
 		encodeVersion: encodeVersion,
@@ -65,11 +80,11 @@ func (c codec) Encode(obj runtime.Object, w io.Writer) error {
 		c.defaulter.Default(out)
 	}
 
-	return Serializer.Encode(out, w)
+	return c.encoder.Encode(out, w)
 }
 
 func (c codec) Decode(data []byte, gvk *schema.GroupVersionKind, _ runtime.Object) (runtime.Object, *schema.GroupVersionKind, error) {
-	in, gvk, err := Serializer.Decode(data, gvk, nil)
+	in, gvk, err := c.decoder.Decode(data, gvk, nil)
 	if err != nil {
 		return nil, gvk, err
 	}