Skip to content

K
k3s
Commit 91662210 authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski
Browse files
Options

apimachinery: normal conversion code path for Unstructured in ConvertToVersion

parent 44ffcdd9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go
View file @ 91662210
...@@ -167,10 +167,14 @@ func (c *codec) Decode(data []byte, defaultGVK *schema.GroupVersionKind, into ru ...@@ -167,10 +167,14 @@ func (c *codec) Decode(data []byte, defaultGVK *schema.GroupVersionKind, into ru
// conversion if necessary. Unversioned objects (according to the ObjectTyper) are output as is. // conversion if necessary. Unversioned objects (according to the ObjectTyper) are output as is.
func (c *codec) Encode(obj runtime.Object, w io.Writer) error { func (c *codec) Encode(obj runtime.Object, w io.Writer) error {
switch obj.(type) { switch obj.(type) {
case *runtime.Unknown, runtime.Unstructured: case *runtime.Unknown:
return c.encoder.Encode(obj, w) return c.encoder.Encode(obj, w)
} }
// Note: for runtime.Unstructured, the typer will return the GVK in the object and we will do conversion as normal below.
// For the normal runtime.Scheme converter the conversion will be a no-op for Unstructured. For CustomResources
// the conversion will actually do something.
gvks, isUnversioned, err := c.typer.ObjectKinds(obj) gvks, isUnversioned, err := c.typer.ObjectKinds(obj)
if err != nil { if err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment