github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 20:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Add Object type to runtime, make runtime test pass.

Browse Source
This commit is contained in:
Daniel Smith
2014-09-05 16:11:30 -07:00
parent 0c6adde92e
commit 77edb91032
12 changed files with 212 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/runtime/embedded.go
View File

@@ -33,7 +33,7 @@ func (a *EmbeddedObject) UnmarshalJSON(b []byte) error {
return nil
}
obj, err := Decode(b)
obj, err := Codec.Decode(b)
if err != nil {
return err
}
@@ -48,7 +48,7 @@ func (a EmbeddedObject) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
}
return Encode(a.Object)
return Codec.Encode(a.Object)
}
// SetYAML implements the yaml.Setter interface.
@@ -67,7 +67,7 @@ func (a *EmbeddedObject) SetYAML(tag string, value interface{}) bool {
if err != nil {
panic("yaml can't reverse its own object")
}
obj, err := Decode(b)
obj, err := Codec.Decode(b)
if err != nil {
return false
}
@@ -82,7 +82,7 @@ func (a EmbeddedObject) GetYAML() (tag string, value interface{}) {
return
}
// Encode returns JSON, which is conveniently a subset of YAML.
v, err := Encode(a.Object)
v, err := Codec.Encode(a.Object)
if err != nil {
panic("impossible to encode API object!")
}